[libpng16] Updated CMakeLists.txt to account for relocated and new test programs.

This commit is contained in:
John Bowler 2011-12-08 09:53:00 -06:00 committed by Glenn Randers-Pehrson
parent eb26ee6602
commit c4081f05c8
3 changed files with 41 additions and 3 deletions

View File

@ -135,12 +135,13 @@ Version 1.6.0alpha01 [December 8, 2011]
as in libpng-1.5.4. as in libpng-1.5.4.
Put CRLF line endings in the owatcom project files. Put CRLF line endings in the owatcom project files.
Fixed minor memset/sizeof errors in pngvalid.c. Fixed minor memset/sizeof errors in pngvalid.c.
Fixed race conditions in parallel make builds. With higher degress of Fixed race conditions in parallel make builds. With higher degrees of
parallelism during 'make' the use of the same temporary file names such parallelism during 'make' the use of the same temporary file names such
as 'dfn*' can result in a race where a temporary file from one arm of the as 'dfn*' can result in a race where a temporary file from one arm of the
build is deleted or overwritten in another arm. This changes the build is deleted or overwritten in another arm. This changes the
temporary files for suffix rules to always use $* and ensures that the temporary files for suffix rules to always use $* and ensures that the
non-suffix rules use unique file names. non-suffix rules use unique file names.
Updated CMakeLists.txt to account for relocated and new test programs.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net: Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
(subscription required; visit (subscription required; visit

View File

@ -3780,12 +3780,14 @@ Version 1.6.0alpha01 [December 8, 2011]
as in libpng-1.5.4. as in libpng-1.5.4.
Put CRLF line endings in the owatcom project files. Put CRLF line endings in the owatcom project files.
Fixed minor memset/sizeof errors in pngvalid.c. Fixed minor memset/sizeof errors in pngvalid.c.
Fixed race conditions in parallel make builds. With higher degress of Fixed race conditions in parallel make builds. With higher degrees of
parallelism during 'make' the use of the same temporary file names such parallelism during 'make' the use of the same temporary file names such
as 'dfn*' can result in a race where a temporary file from one arm of the as 'dfn*' can result in a race where a temporary file from one arm of the
build is deleted or overwritten in another arm. This changes the build is deleted or overwritten in another arm. This changes the
temporary files for suffix rules to always use $* and ensures that the temporary files for suffix rules to always use $* and ensures that the
non-suffix rules use unique file names. non-suffix rules use unique file names.
Updated CMakeLists.txt to account for relocated and new test programs.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

View File

@ -121,7 +121,10 @@ set(pngtest_sources
pngtest.c pngtest.c
) )
set(pngvalid_sources set(pngvalid_sources
pngvalid.c contrib/libtests/pngvalid.c
)
set(pngstest_sources
contrib/libtests/pngstest.c
) )
# SOME NEEDED DEFINITIONS # SOME NEEDED DEFINITIONS
@ -172,6 +175,38 @@ if(PNG_TESTS AND PNG_SHARED)
add_executable(pngvalid ${pngvalid_sources}) add_executable(pngvalid ${pngvalid_sources})
target_link_libraries(pngvalid ${PNG_LIB_NAME}) target_link_libraries(pngvalid ${PNG_LIB_NAME})
add_test(pngvalid ./pngvalid) add_test(pngvalid ./pngvalid)
add_executable(pngstest ${pngstest_sources})
target_link_libraries(pngstest ${PNG_LIB_NAME})
add_test(pngstest ./pngstest
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g01.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g02.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g04.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g08.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g16.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn2c08.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn2c16.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn3p01.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn3p02.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn3p04.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn3p08.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn4a08.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn4a16.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn6a08.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn6a16.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn1g04.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn2c16.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn3p08.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbgn2c16.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbgn3p08.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbrn2c08.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbwn1g16.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbwn3p08.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbyn3p08.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftp0n1g08.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftp0n2c08.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftp0n3p08.png
${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftp1n3p08.png
)
endif() endif()
# Ensure the CMAKE_LIBRARY_OUTPUT_DIRECTORY is set # Ensure the CMAKE_LIBRARY_OUTPUT_DIRECTORY is set