From c4081f05c88d171cd476d5df78ed4a690296c602 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Thu, 8 Dec 2011 09:53:00 -0600 Subject: [PATCH] [libpng16] Updated CMakeLists.txt to account for relocated and new test programs. --- ANNOUNCE | 3 ++- CHANGES | 4 +++- CMakeLists.txt | 37 ++++++++++++++++++++++++++++++++++++- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 16f21dbe2..be3d323d3 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -135,12 +135,13 @@ Version 1.6.0alpha01 [December 8, 2011] as in libpng-1.5.4. Put CRLF line endings in the owatcom project files. 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 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 temporary files for suffix rules to always use $* and ensures that the 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: (subscription required; visit diff --git a/CHANGES b/CHANGES index 3f5ef314d..546780b33 100644 --- a/CHANGES +++ b/CHANGES @@ -3780,12 +3780,14 @@ Version 1.6.0alpha01 [December 8, 2011] as in libpng-1.5.4. Put CRLF line endings in the owatcom project files. 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 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 temporary files for suffix rules to always use $* and ensures that the 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 (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index d53f80435..08c90c397 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,7 +121,10 @@ set(pngtest_sources pngtest.c ) set(pngvalid_sources - pngvalid.c + contrib/libtests/pngvalid.c +) +set(pngstest_sources + contrib/libtests/pngstest.c ) # SOME NEEDED DEFINITIONS @@ -172,6 +175,38 @@ if(PNG_TESTS AND PNG_SHARED) add_executable(pngvalid ${pngvalid_sources}) target_link_libraries(pngvalid ${PNG_LIB_NAME}) 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() # Ensure the CMAKE_LIBRARY_OUTPUT_DIRECTORY is set