[trunk] fix error with new way to detect kdu_expand

diff --git a/CHANGES b/CHANGES
index cf0214e2a1e7e1ed4b33589d58cf55f6ea394e4c..bdf2138637c5893ffb3a3d1b33d3db768074668b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+November 29, 2011
+* [mickael] fix error with new way to detect kdu_expand
+
 November 27, 2011
 * [jmalik] clean up redundant includes already handled in opj_includes.h
 * [jmalik] reverted changeset 1091 (see issue #103)

diff --git a/tests/nonregression/CMakeLists.txt b/tests/nonregression/CMakeLists.txt
index fbadd615709826a35cf94453afa0107cb0de2756..4589ddfcc84717c6df487915f13a4effd5a586c2 100644 (file)
--- a/tests/nonregression/CMakeLists.txt
+++ b/tests/nonregression/CMakeLists.txt
@@ -263,7 +263,7 @@ FOREACH(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
                                NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-dump) 
     
           # Decode the encoding file with kakadu expand command
-          IF (NOT REF_DECODER_NOTFOUND)
+          IF (REF_DECODER_BIN_PATH)
             IF (NOT WIN32)
               # Need a bash script to export the path of the kakadu library into PATH  
               ADD_TEST( NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref
@@ -294,7 +294,7 @@ FOREACH(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
                                  PROPERTIES DEPENDS 
                                  NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref)
         
-          ENDIF(NOT REF_DECODER_NOTFOUND)
+          ENDIF(REF_DECODER_BIN_PATH)
       ENDIF(FAILED_TEST_FOUND)     
     
     # DECODER TEST SUITE