diff options
| author | Chris Liddell <chris.liddell@artifex.com> | 2018-03-27 14:08:47 +0100 |
|---|---|---|
| committer | Chris Liddell <chris.liddell@artifex.com> | 2018-03-29 13:44:03 +0100 |
| commit | 003c4211a019eb5c4719860f353777e177553490 (patch) | |
| tree | e526be8e98c305b1cc135714fa7c9e272ecfd20a /tiff/test/CMakeLists.txt | |
| parent | bc817a3afdb932eadac17155834f89efd1c96da4 (diff) | |
| download | ghostpdl-003c4211a019eb5c4719860f353777e177553490.tar.gz | |
Update libtiff to 4.0.9
Add in portability changes to tiffiop.h
Portability tiffiop.h
Remove globals from tif_pixarlog.c
Tweaks to support libtiff 4.0.9
Diffstat (limited to 'tiff/test/CMakeLists.txt')
| -rw-r--r-- | tiff/test/CMakeLists.txt | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/tiff/test/CMakeLists.txt b/tiff/test/CMakeLists.txt index b9e373f96..912be19ca 100644 --- a/tiff/test/CMakeLists.txt +++ b/tiff/test/CMakeLists.txt @@ -43,6 +43,7 @@ set(TESTSCRIPTS tiffcp-g4.sh tiffcp-logluv.sh tiffcp-thumbnail.sh + tiffcp-lzw-compat.sh tiffdump.sh tiffinfo.sh tiffcp-split.sh @@ -118,7 +119,8 @@ set(TIFFIMAGES images/palette-1c-8b.tiff images/rgb-3c-16b.tiff images/rgb-3c-8b.tiff - images/quad-tile.jpg.tiff) + images/quad-tile.jpg.tiff + images/quad-lzw-compat.tiff) set(BMPIMAGES images/palette-1c-8b.bmp @@ -185,6 +187,18 @@ target_link_libraries(custom_dir tiff port) set(TEST_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/output") file(MAKE_DIRECTORY "${TEST_OUTPUT}") +set(tiff_test_extra_args + "-DTIFFCP=$<TARGET_FILE:tiffcp>" + "-DTIFFINFO=$<TARGET_FILE:tiffinfo>" + "-DTIFFSPLIT=$<TARGET_FILE:tiffsplit>" + "-DLIBTIFF=$<TARGET_FILE:tiff>") +if(WIN32) + list(APPEND tiff_test_extra_args "-DWIN32=${WIN32}") +endif() +if(CYGWIN) + list(APPEND tiff_test_extra_args "-DCYGWIN=${CYGWIN}") +endif() + macro(tiff_test_convert name command1 command2 command3 infile outfile validate) add_test(NAME "${name}" COMMAND "${CMAKE_COMMAND}" @@ -193,9 +207,8 @@ macro(tiff_test_convert name command1 command2 command3 infile outfile validate) "-DCONVERT_COMMAND3=${command3}" "-DINFILE=${infile}" "-DOUTFILE=${outfile}" - "-DTIFFINFO=$<TARGET_FILE:tiffinfo>" - "-DLIBTIFF=$<TARGET_FILE:tiff>" "-DVALIDATE=${validate}" + ${tiff_test_extra_args} -P "${CMAKE_CURRENT_SOURCE_DIR}/TiffTest.cmake") endmacro() @@ -205,8 +218,7 @@ macro(tiff_test_stdout name command infile outfile) "-DSTDOUT_COMMAND=${command}" "-DINFILE=${infile}" "-DOUTFILE=${outfile}" - "-DTIFFINFO=$<TARGET_FILE:tiffinfo>" - "-DLIBTIFF=$<TARGET_FILE:tiff>" + ${tiff_test_extra_args} -P "${CMAKE_CURRENT_SOURCE_DIR}/TiffTest.cmake") endmacro() @@ -215,8 +227,7 @@ macro(tiff_test_reader name command infile) COMMAND "${CMAKE_COMMAND}" "-DREADER_COMMAND=${command}" "-DINFILE=${infile}" - "-DTIFFINFO=$<TARGET_FILE:tiffinfo>" - "-DLIBTIFF=$<TARGET_FILE:tiff>" + ${tiff_test_extra_args} -P "${CMAKE_CURRENT_SOURCE_DIR}/TiffTest.cmake") endmacro() @@ -323,6 +334,7 @@ add_convert_test(tiffcp g31dfill "-c g3:1d:fill" "images/miniswhite-1c-1b.ti add_convert_test(tiffcp g32d "-c g3:2d" "images/miniswhite-1c-1b.tiff" FALSE) add_convert_test(tiffcp g32dfill "-c g3:2d:fill" "images/miniswhite-1c-1b.tiff" FALSE) add_convert_test(tiffcp g4 "-c g4" "images/miniswhite-1c-1b.tiff" FALSE) +add_convert_test(tiffcp none "-c none" "images/quad-lzw-compat.tiff" FALSE) add_convert_test_multi(tiffcp tiffcp "" logluv "-c none" "-c sgilog" "" "images/logluv-3c-16b.tiff" FALSE) add_convert_test_multi(tiffcp thumbnail "" thumbnail "g3:1d" "" "" @@ -344,9 +356,7 @@ add_test(NAME "tiffcp-split" "-DTESTFILES=${ESCAPED_UNCOMPRESSED}" "-DCONJOINED=${TEST_OUTPUT}/tiffcp-split-conjoined.tif" "-DSPLITFILE=${TEST_OUTPUT}/tiffcp-split-split-" - "-DTIFFCP=$<TARGET_FILE:tiffcp>" - "-DTIFFSPLIT=$<TARGET_FILE:tiffsplit>" - "-DLIBTIFF=$<TARGET_FILE:tiff>" + ${tiff_test_extra_args} -P "${CMAKE_CURRENT_SOURCE_DIR}/TiffSplitTest.cmake") add_test(NAME "tiffcp-split-join" COMMAND "${CMAKE_COMMAND}" @@ -354,9 +364,7 @@ add_test(NAME "tiffcp-split-join" "-DCONJOINED=${TEST_OUTPUT}/tiffcp-split-join-conjoined.tif" "-DSPLITFILE=${TEST_OUTPUT}/tiffcp-split-join-split-" "-DRECONJOINED=${TEST_OUTPUT}/tiffcp-split-join-reconjoined.tif" - "-DTIFFCP=$<TARGET_FILE:tiffcp>" - "-DTIFFSPLIT=$<TARGET_FILE:tiffsplit>" - "-DLIBTIFF=$<TARGET_FILE:tiff>" + ${tiff_test_extra_args} -P "${CMAKE_CURRENT_SOURCE_DIR}/TiffSplitTest.cmake") # PDF |