From 263e0f3bb2f101450f85e600bd09e704bc15c0eb Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Fri, 7 Sep 2007 13:27:16 +0000 Subject: [PATCH] ENH: make it a little more user friendly --- CMakeLists.txt | 15 ++++++++++----- 1 file 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})