[trunk] fix tests/nonregresion/CMakeList.txt

[openjpeg.git] / tests / CMakeLists.txt

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 858befb4a1a6334812918ee4c9fde8c24a71fe15..0a6215c48df106466534b9467067ba0ac4efbcb5 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -3,25 +3,28 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 INCLUDE_DIRECTORIES(${OPENJPEG_SOURCE_DIR}/libopenjpeg
                     ${OPENJPEG_SOURCE_DIR}/applications/codec
                     ${OPENJPEG_SOURCE_DIR}/applications/common
+                    ${Z_INCLUDE_DIRNAME}
+                    ${PNG_INCLUDE_DIRNAME}
+                    ${TIFF_INCLUDE_DIRNAME}
                     )
 
 # First thing define the common source:
-SET(comparePGXimages_SRCS comparePGXimages.c ${OPENJPEG_SOURCE_DIR}/applications/codec/convert.c)
+SET(comparePGXimages_SRCS comparePGXimages.c ${OPENJPEG_SOURCE_DIR}/applications/codec/convert.c ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c)
 
-# If not getopt was found then add it to the exe:
-IF(DONT_HAVE_GETOPT)
-  message("dont have getopt, we will add it")
-  SET(comparePGXimages_SRCS
-    ${comparePGXimages_SRCS}
-    ${OPENJPEG_SOURCE_DIR}/applications/common/getopt.c
-  )
-ENDIF(DONT_HAVE_GETOPT)
+SET(compare_dump_files_SRCS compare_dump_files.c ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c)
+
+SET(compareRAWimages_SRCS compareRAWimages.c ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c)
 
 ADD_EXECUTABLE(comparePGXimages ${comparePGXimages_SRCS})
 TARGET_LINK_LIBRARIES(comparePGXimages ${OPENJPEG_LIBRARY_NAME}
-                                        ${PNG_LIBNAME}
-                                        ${TIFF_LIBNAME}
-                                        )
+                                       ${Z_LIBNAME}
+                                       ${PNG_LIBNAME}
+                                       ${TIFF_LIBNAME}
+                                       )
+                                       
+ADD_EXECUTABLE(compare_dump_files ${compare_dump_files_SRCS})
+
+ADD_EXECUTABLE(compareRAWimages ${compareRAWimages_SRCS})
 
 # No image send to the dashboard if lib PNG is not available.
 IF(NOT HAVE_LIBPNG)
@@ -29,3 +32,4 @@ IF(NOT HAVE_LIBPNG)
 ENDIF(NOT HAVE_LIBPNG)
 
 ADD_SUBDIRECTORY(conformance)
+ADD_SUBDIRECTORY(nonregression)