summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Malaterre <mathieu.malaterre@gmail.com>2007-09-07 13:27:16 +0000
committerMathieu Malaterre <mathieu.malaterre@gmail.com>2007-09-07 13:27:16 +0000
commit263e0f3bb2f101450f85e600bd09e704bc15c0eb (patch)
tree47c2a5b232ede37fca9d51f8115d80d35bd23677
parentb29cff9b9c081ef1f80088fae4a3c4d7a3b7a082 (diff)
ENH: make it a little more user friendly
-rw-r--r--CMakeLists.txt15
1 files changed, 10 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 550af2b1..8ea303b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,12 +95,17 @@ ENDIF(OPENJPEG_STANDALONE)
# http://www.crc.ricoh.com/~gormish/jpeg2000conformance/
# http://www.jpeg.org/jpeg2000guide/testimages/testimages.html
+#-----------------------------------------------------------------------------
+# Adding JPEG2000_CONFORMANCE_DATA_ROOT
+FIND_PATH(JPEG2000_CONFORMANCE_DATA_ROOT testimages.html
+ ${OPENJPEG_SOURCE_DIR}/../jpeg2000testimages
+ $ENV{JPEG2000_CONFORMANCE_DATA_ROOT}
+)
+
FILE(GLOB_RECURSE OPENJPEG_DATA_IMAGES_GLOB
-# "${OPENJPEG_SOURCE_DIR}/testing1/*.j2k"
-# "${OPENJPEG_SOURCE_DIR}/testing1/*.jp2"
- "${OPENJPEG_SOURCE_DIR}/testimages/*.j2k"
- "${OPENJPEG_SOURCE_DIR}/testimages/*.j2c"
- "${OPENJPEG_SOURCE_DIR}/testimages/*.jp2"
+ "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2k"
+ "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2c"
+ "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.jp2"
)
FOREACH(filename ${OPENJPEG_DATA_IMAGES_GLOB})