From 3932e860ca8012bc3ce954bff0f576a0fc76835b Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Tue, 29 Nov 2011 09:28:02 +0000 Subject: [PATCH] [trunk] fix error with new way to detect kdu_expand --- CHANGES | 3 +++ tests/nonregression/CMakeLists.txt | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index cf0214e2..bdf21386 100644 --- 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 fbadd615..4589ddfc 100644 --- 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