diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-30 17:14:39 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-30 17:14:39 +0000 |
| commit | d5bb3b0039159a61c7e9b2ae157a7b6ec2c0aef5 (patch) | |
| tree | 8114a5c8fef51e462e9baea495ad0fe210c3b3a6 /tests/CMakeLists.txt | |
| parent | f16216e2708c3b480f726d64b589f092bbc48b02 (diff) | |
[trunk] Convert CMake-language commands to lower case
Ancient CMake versions required upper-case commands. Later command names became case-insensitive. Now the preferred style is lower-case.
This also changes all the key words to lower case. The primary reason for changing key words is that all documentation for CMakeLists.txt now shows the key words as lower case. Even the printed “Mastering CMake v5” uses lower case.
Thanks to Hans Johnson
Diffstat (limited to 'tests/CMakeLists.txt')
| -rw-r--r-- | tests/CMakeLists.txt | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a5ada2f8..0b1ce71b 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,5 +1,5 @@ # Tests -INCLUDE_DIRECTORIES( +include_directories( ${OPENJPEG_SOURCE_DIR}/libopenjpeg ${OPENJPEG_SOURCE_DIR}/applications/codec ${OPENJPEG_SOURCE_DIR}/applications/common @@ -9,72 +9,72 @@ INCLUDE_DIRECTORIES( ) # First thing define the common source: -SET(comparePGXimages_SRCS comparePGXimages.c +set(comparePGXimages_SRCS comparePGXimages.c ${OPENJPEG_SOURCE_DIR}/applications/codec/convert.c ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c ) -SET(compare_dump_files_SRCS compare_dump_files.c +set(compare_dump_files_SRCS compare_dump_files.c ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c) -SET(compareRAWimages_SRCS compareRAWimages.c +set(compareRAWimages_SRCS compareRAWimages.c ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c) -ADD_EXECUTABLE(comparePGXimages ${comparePGXimages_SRCS}) -TARGET_LINK_LIBRARIES(comparePGXimages +add_executable(comparePGXimages ${comparePGXimages_SRCS}) +target_link_libraries(comparePGXimages ${OPENJPEG_LIBRARY_NAME} ${PNG_LIBNAME} ${TIFF_LIBNAME} ) # To support universal exe: -IF(ZLIB_FOUND AND APPLE) - TARGET_LINK_LIBRARIES(comparePGXimages z) +if(ZLIB_FOUND AND APPLE) + target_link_libraries(comparePGXimages z) ELSe(ZLIB_FOUND AND APPLE) - TARGET_LINK_LIBRARIES(comparePGXimages ${Z_LIBNAME}) -ENDIF(ZLIB_FOUND AND APPLE) + target_link_libraries(comparePGXimages ${Z_LIBNAME}) +endif(ZLIB_FOUND AND APPLE) -ADD_EXECUTABLE(compare_dump_files ${compare_dump_files_SRCS}) +add_executable(compare_dump_files ${compare_dump_files_SRCS}) -ADD_EXECUTABLE(j2k_random_tile_access j2k_random_tile_access.c) -TARGET_LINK_LIBRARIES(j2k_random_tile_access ${OPENJPEG_LIBRARY_NAME}) +add_executable(j2k_random_tile_access j2k_random_tile_access.c) +target_link_libraries(j2k_random_tile_access ${OPENJPEG_LIBRARY_NAME}) -ADD_EXECUTABLE(compareRAWimages ${compareRAWimages_SRCS}) +add_executable(compareRAWimages ${compareRAWimages_SRCS}) -ADD_EXECUTABLE(test_tile_encoder test_tile_encoder.c) -TARGET_LINK_LIBRARIES(test_tile_encoder ${OPENJPEG_LIBRARY_NAME}) +add_executable(test_tile_encoder test_tile_encoder.c) +target_link_libraries(test_tile_encoder ${OPENJPEG_LIBRARY_NAME}) # Let's try a couple of possibilities: -ADD_TEST(tte0 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder) -ADD_TEST(tte1 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder 3 2048 2048 1024 1024 8 1 tte1.j2k) -ADD_TEST(tte2 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder 3 2048 2048 1024 1024 8 1 tte2.jp2) -ADD_TEST(tte3 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder 1 2048 2048 1024 1024 8 1 tte3.j2k) -ADD_TEST(tte4 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder 1 256 256 128 128 8 0 tte4.j2k) -ADD_TEST(tte5 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder 1 512 512 256 256 8 0 tte5.j2k) +add_test(tte0 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder) +add_test(tte1 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder 3 2048 2048 1024 1024 8 1 tte1.j2k) +add_test(tte2 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder 3 2048 2048 1024 1024 8 1 tte2.jp2) +add_test(tte3 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder 1 2048 2048 1024 1024 8 1 tte3.j2k) +add_test(tte4 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder 1 256 256 128 128 8 0 tte4.j2k) +add_test(tte5 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder 1 512 512 256 256 8 0 tte5.j2k) -ADD_EXECUTABLE(test_tile_decoder test_tile_decoder.c) -TARGET_LINK_LIBRARIES(test_tile_decoder ${OPENJPEG_LIBRARY_NAME}) +add_executable(test_tile_decoder test_tile_decoder.c) +target_link_libraries(test_tile_decoder ${OPENJPEG_LIBRARY_NAME}) -ADD_TEST(ttd0 ${EXECUTABLE_OUTPUT_PATH}/test_tile_decoder) +add_test(ttd0 ${EXECUTABLE_OUTPUT_PATH}/test_tile_decoder) set_property(TEST ttd0 APPEND PROPERTY DEPENDS tte0) -ADD_TEST(ttd1 ${EXECUTABLE_OUTPUT_PATH}/test_tile_decoder 0 0 1024 1024 tte1.j2k) +add_test(ttd1 ${EXECUTABLE_OUTPUT_PATH}/test_tile_decoder 0 0 1024 1024 tte1.j2k) set_property(TEST ttd1 APPEND PROPERTY DEPENDS tte1) -ADD_TEST(ttd2 ${EXECUTABLE_OUTPUT_PATH}/test_tile_decoder 0 0 1024 1024 tte2.jp2) +add_test(ttd2 ${EXECUTABLE_OUTPUT_PATH}/test_tile_decoder 0 0 1024 1024 tte2.jp2) set_property(TEST ttd2 APPEND PROPERTY DEPENDS tte2) # No image send to the dashboard if lib PNG is not available. -IF(NOT HAVE_LIBPNG) - MESSAGE(WARNING "Lib PNG seems to be not available: if you want run the non-regression tests with images reported to the dashboard, you need it (try BUILD_THIRDPARTY)") -ENDIF(NOT HAVE_LIBPNG) +if(NOT HAVE_LIBPNG) + message(WARNING "Lib PNG seems to be not available: if you want run the non-regression tests with images reported to the dashboard, you need it (try BUILD_THIRDPARTY)") +endif(NOT HAVE_LIBPNG) -ADD_SUBDIRECTORY(conformance) -ADD_SUBDIRECTORY(nonregression) +add_subdirectory(conformance) +add_subdirectory(nonregression) -IF(BUILD_JPIP) - IF(JPIP_SERVER) - #SET(s "http://jpip.example.com/myFCGI?target=16.jp2&fsiz=170,170&cnew=http&type=jpp-stream") - SET(s "${JPIP_SERVER}?target=16.jp2&fsiz=170,170&cnew=http&type=jpp-stream") - SET(p "${CMAKE_CURRENT_BINARY_DIR}/jpip.dat") - SET(md5 "62b00c620fb0a600c5ffd413cada4674") - ADD_TEST(TestJPIP1 ${CMAKE_COMMAND} -DD_URL:STRING=${s} -DD_FILE:PATH=${p} +if(BUILD_JPIP) + if(JPIP_SERVER) + #set(s "http://jpip.example.com/myFCGI?target=16.jp2&fsiz=170,170&cnew=http&type=jpp-stream") + set(s "${JPIP_SERVER}?target=16.jp2&fsiz=170,170&cnew=http&type=jpp-stream") + set(p "${CMAKE_CURRENT_BINARY_DIR}/jpip.dat") + set(md5 "62b00c620fb0a600c5ffd413cada4674") + add_test(TestJPIP1 ${CMAKE_COMMAND} -DD_URL:STRING=${s} -DD_FILE:PATH=${p} -DEXPECTED_MD5=${md5} -P ${PROJECT_SOURCE_DIR}/CMake/JPIPTestDriver.cmake) - ENDIF(JPIP_SERVER) -ENDIF(BUILD_JPIP) + endif(JPIP_SERVER) +endif(BUILD_JPIP) |
