diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2010-06-29 19:08:58 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2010-06-29 19:08:58 +0000 |
| commit | 89eafad589e87f934b89f3998d0935663b8d03c9 (patch) | |
| tree | a54f899798aca091572e6fb970517e55e259e851 /codec | |
| parent | 8bb5a19905619156878eb3960bf21a2ab5d87114 (diff) | |
Synchronize branch and trunk cmakelists files
Diffstat (limited to 'codec')
| -rw-r--r-- | codec/CMakeLists.txt | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/codec/CMakeLists.txt b/codec/CMakeLists.txt index 1e04b38b..9e5b0eb2 100644 --- a/codec/CMakeLists.txt +++ b/codec/CMakeLists.txt @@ -52,9 +52,13 @@ FOREACH(exe j2k_to_image image_to_j2k j2k_dump) TARGET_LINK_LIBRARIES(${exe} m) ENDIF(UNIX) # Install exe - INSTALL_TARGETS(/bin/ ${exe}) + INSTALL(TARGETS ${exe} + EXPORT OpenJPEGTargets + DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications + ) ENDFOREACH(exe) +if(BUILD_TESTING) # Do testing here, once we know the examples are being built: FILE(GLOB_RECURSE OPENJPEG_DATA_IMAGES_GLOB "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2k" @@ -62,8 +66,27 @@ FILE(GLOB_RECURSE OPENJPEG_DATA_IMAGES_GLOB "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.jp2" ) -FOREACH(filename ${OPENJPEG_DATA_IMAGES_GLOB}) - GET_FILENAME_COMPONENT(filename_temp ${filename} NAME) - ADD_TEST(j2i-${filename_temp} ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image -i ${filename} -o ${filename_temp}.tif) -ENDFOREACH(filename) - +foreach(filename ${OPENJPEG_DATA_IMAGES_GLOB}) + get_filename_component(filename_temp ${filename} NAME) + get_filename_component(filename_ext ${filename} EXT) + execute_process(COMMAND ${EXECUTABLE_OUTPUT_PATH}/j2k_dump -i ${filename} + OUTPUT_VARIABLE dump_success + OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${filename_temp}.dump + ERROR_QUIET + ) + if(dump_success) + file(READ ${CMAKE_CURRENT_BINARY_DIR}/${filename_temp}.dump numcomp_file) + string(REGEX REPLACE ".*numcomps=([0-9]+).*" "\\1" + numcomps "${numcomp_file}") + #message( "found:${output_variable} for ${filename_temp}" ) + endif() + ADD_TEST(dump-${filename_temp} ${EXECUTABLE_OUTPUT_PATH}/j2k_dump -i ${filename}) + foreach(codec_type ppm pgx bmp tif raw tga png) + ADD_TEST(j2i-${filename_temp}-${codec_type} ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image -i ${filename} -o ${filename_temp}.${codec_type}) + ADD_TEST(i2j-${filename_temp}-${codec_type} ${EXECUTABLE_OUTPUT_PATH}/image_to_j2k -i ${filename_temp}.${codec_type} -o ${filename_temp}.${codec_type}${filename_ext}) + #if(UNIX) + # ADD_TEST(cmp-${filename_temp}-${codec_type} cmp ${filename} ${filename_temp}.${codec_type}${filename_ext}) + #endif(UNIX) + endforeach(codec_type) +endforeach(filename) +endif(BUILD_TESTING) |