[trunk] modify image_to_j2k and the lib to support functionalities given by the v2...

[openjpeg.git] / applications / codec / CMakeLists.txt

diff --git a/applications/codec/CMakeLists.txt b/applications/codec/CMakeLists.txt
index f56ee0b556cf5b92a1fed09ae458b4c8e2f4197a..2a195155ac2b5645d90a704e4a93b0eb76451e29 100644 (file)
--- a/applications/codec/CMakeLists.txt
+++ b/applications/codec/CMakeLists.txt
@@ -5,15 +5,8 @@ SET(common_SRCS
   convert.c
   index.c
   ${OPENJPEG_SOURCE_DIR}/applications/common/color.c
-)
-
-# If not getopt was found then add it to the lib:
-IF(DONT_HAVE_GETOPT)
-  SET(common_SRCS
-    ${common_SRCS}
-    ${OPENJPEG_SOURCE_DIR}/applications/common/getopt.c
+  ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c
   )
-ENDIF(DONT_HAVE_GETOPT)
 
 # Headers file are located here:
 INCLUDE_DIRECTORIES(
@@ -37,11 +30,15 @@ ENDIF(WIN32)
 FOREACH(exe j2k_to_image image_to_j2k j2k_dump)
   ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS})
   TARGET_LINK_LIBRARIES(${exe} ${OPENJPEG_LIBRARY_NAME} 
-${Z_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME} ${LCMS_LIBNAME} )
+    ${PNG_LIBNAME} ${TIFF_LIBNAME} ${LCMS_LIBNAME}
+    )
+  # To support universal exe:
+  IF(ZLIB_FOUND AND APPLE)
+    TARGET_LINK_LIBRARIES(${exe} z)
+  ELSe(ZLIB_FOUND AND APPLE)
+    TARGET_LINK_LIBRARIES(${exe} ${Z_LIBNAME})
+  ENDIF(ZLIB_FOUND AND APPLE)
 
-  ADD_TEST(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe})
-  # calling those exe without option will make them fail always:
-  SET_TESTS_PROPERTIES(${exe} PROPERTIES WILL_FAIL TRUE)
   # On unix you need to link to the math library:
   IF(UNIX)
     TARGET_LINK_LIBRARIES(${exe} m)
@@ -73,7 +70,14 @@ IF(BUILD_JPWL)
   )
 
   TARGET_LINK_LIBRARIES(JPWL_j2k_to_image ${OPENJPEG_LIBRARY_NAME}_JPWL
-    ${LCMS_LIBNAME} ${Z_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME})
+    ${LCMS_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME})
+    
+  # To support universal exe:
+  IF(ZLIB_FOUND AND APPLE)
+    TARGET_LINK_LIBRARIES(JPWL_j2k_to_image z)
+  ELSe(ZLIB_FOUND AND APPLE)
+    TARGET_LINK_LIBRARIES(JPWL_j2k_to_image ${Z_LIBNAME})
+  ENDIF(ZLIB_FOUND AND APPLE)
   
   IF(UNIX)
     TARGET_LINK_LIBRARIES(JPWL_j2k_to_image m)
@@ -90,7 +94,14 @@ IF(BUILD_JPWL)
   )
 
   TARGET_LINK_LIBRARIES(JPWL_image_to_j2k ${OPENJPEG_LIBRARY_NAME}_JPWL 
-       ${LCMS_LIBNAME} ${Z_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME})
+       ${LCMS_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME})
+       
+  # To support universal exe:
+  IF(ZLIB_FOUND AND APPLE)
+    TARGET_LINK_LIBRARIES(JPWL_image_to_j2k z)
+  ELSe(ZLIB_FOUND AND APPLE)
+    TARGET_LINK_LIBRARIES(JPWL_image_to_j2k ${Z_LIBNAME})
+  ENDIF(ZLIB_FOUND AND APPLE)
 
   IF(UNIX)
     TARGET_LINK_LIBRARIES(JPWL_image_to_j2k m)
@@ -100,39 +111,3 @@ IF(BUILD_JPWL)
     DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
   )
 ENDIF(BUILD_JPWL)
-
-#if(BUILD_TESTING)
-## Do testing here, once we know the examples are being built:
-#FILE(GLOB_RECURSE OPENJPEG_DATA_IMAGES_GLOB
-#  "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2k"
-#  "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2c"
-#  "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.jp2"
-#  )
-
-#foreach(filename ${OPENJPEG_DATA_IMAGES_GLOB})
-#  get_filename_component(filename_temp ${filename} NAME)
-#  get_filename_component(filename_ext ${filename} EXT)
-#  execute_process(COMMAND ${EXECUTABLE_OUTPUT_PATH}/j2k_dump -i ${filename}
-#    OUTPUT_VARIABLE dump_success
-#    OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${filename_temp}.dump
-#    ERROR_QUIET
-#  )
-#  if(dump_success)
-#  file(READ ${CMAKE_CURRENT_BINARY_DIR}/${filename_temp}.dump numcomp_file)
-#  string(REGEX REPLACE ".*numcomps=([0-9]+).*" "\\1"
-#    numcomps "${numcomp_file}")
-#  #message( "found:${output_variable} for ${filename_temp}" )
-#  endif()
-#  ADD_TEST(dump-${filename_temp} ${EXECUTABLE_OUTPUT_PATH}/j2k_dump -i ${filename})
-#  foreach(codec_type ppm pgx bmp tif raw tga png)
-#    ADD_TEST(j2i-${filename_temp}-${codec_type} ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image -i ${filename} -o ${filename_temp}.${codec_type})
-#  endforeach(codec_type)
-#  foreach(codec_type ppm bmp tif tga png)
-#    ADD_TEST(i2j-${filename_temp}-${codec_type} ${EXECUTABLE_OUTPUT_PATH}/image_to_j2k -i ${filename_temp}.${codec_type} -o ${filename_temp}.${codec_type}${filename_ext})
-#    SET_TESTS_PROPERTIES(i2j-${filename_temp}-${codec_type} PROPERTIES DEPENDS j2i-${filename_temp}-${codec_type})
-#    #if(UNIX)
-#    #  ADD_TEST(cmp-${filename_temp}-${codec_type} cmp ${filename} ${filename_temp}.${codec_type}${filename_ext})
-#    #endif(UNIX)
-#  endforeach(codec_type)
-#endforeach(filename)
-#endif(BUILD_TESTING)