diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2007-09-07 13:49:57 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2007-09-07 13:49:57 +0000 |
| commit | 3392d99487fbe089c1d9b84ed7f31ede68de3769 (patch) | |
| tree | fbfc8f04813beb446fec1b8d04b069180c40791e | |
| parent | 263e0f3bb2f101450f85e600bd09e704bc15c0eb (diff) | |
BUG: cannot run tests if EXAMPLES are not built
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | codec/CMakeLists.txt | 11 |
2 files changed, 11 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ea303b0..18af55c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,14 +102,4 @@ FIND_PATH(JPEG2000_CONFORMANCE_DATA_ROOT testimages.html $ENV{JPEG2000_CONFORMANCE_DATA_ROOT} ) -FILE(GLOB_RECURSE OPENJPEG_DATA_IMAGES_GLOB - "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2k" - "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2c" - "${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) diff --git a/codec/CMakeLists.txt b/codec/CMakeLists.txt index 84eb07a1..ecc31bdd 100644 --- a/codec/CMakeLists.txt +++ b/codec/CMakeLists.txt @@ -53,4 +53,15 @@ FOREACH(exe j2k_to_image image_to_j2k) INSTALL_TARGETS(/bin/ ${exe}) ENDFOREACH(exe) +# Do testing here, once we know the examples are being built: +FILE(GLOB_RECURSE OPENJPEG_DATA_IMAGES_GLOB + "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2k" + "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2c" + "${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) |