BUG: cannot run tests if EXAMPLES are not built

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ea303b06d5a3036ac6c981d6c7c69a35a69d8c7..18af55c0bdbc83c8cf4e3d34f76d920cd4ec4bbb 100644 (file)
--- 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 84eb07a1f5af80328c5c4ef4ef563a5687d3cb5a..ecc31bdd69bcbdffb75f36ed0ec2558f3b57797e 100644 (file)
--- 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)