Another round of universal fixes

[openjpeg.git] / tests / CMakeLists.txt

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 29879b8256428ef7d505f73f07ac305f56d66a9a..9bf82c0c496f05f6679797fa613b5146dbdf487f 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,31 +1,45 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-
-INCLUDE_DIRECTORIES(${OPENJPEG_SOURCE_DIR}/libopenjpeg
-                    ${OPENJPEG_SOURCE_DIR}/applications/codec
-                    ${OPENJPEG_SOURCE_DIR}/applications/common
-                    )
+# Tests
+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)
-
-# If not getopt was found then add it to the exe:
-IF(DONT_HAVE_GETOPT)
-  message("dont have getopt, we will add it")
-  SET(common_SRCS
-    ${common_SRCS}
-    ${OPENJPEG_SOURCE_DIR}/applications/common/getopt.c
+SET(comparePGXimages_SRCS comparePGXimages.c
+  ${OPENJPEG_SOURCE_DIR}/applications/codec/convert.c
+  ${OPENJPEG_SOURCE_DIR}/applications/common/opj_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}
-                                        )
+TARGET_LINK_LIBRARIES(comparePGXimages
+  ${OPENJPEG_LIBRARY_NAME}
+  ${PNG_LIBNAME} ${TIFF_LIBNAME}
+  )
+# To support universal exe:
+IF(ZLIB_FOUND AND APPLE)
+  TARGET_LINK_LIBRARIES(comparePGXimages z)
+ELSe(ZLIB_FOUND AND APPLE)
+  TARGET_LINK_LIBRARIES(comparePGXimages ${Z_LIBNAME})
+ENDIF(ZLIB_FOUND AND APPLE)
+
+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)
   MESSAGE(WARNING "Lib PNG seems to be not available: if you want run the non-regression tests with images reported to the dashboard, you need it (try BUILD_THIRDPARTY)") 
 ENDIF(NOT HAVE_LIBPNG)
 
-ADD_SUBDIRECTORY(conformance)
\ No newline at end of file
+ADD_SUBDIRECTORY(conformance)
+ADD_SUBDIRECTORY(nonregression)