imagetopgx(): improve performance in 8 bit case (relates to broken.jpc test case)

[openjpeg.git] / src / bin / jp2 / CMakeLists.txt

diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt
index 857a1d92cb55a0196dca2d58e53a3988c03bc774..4324c36d04c90a42618935658fc8e65ab3aa3e61 100644 (file)
--- a/src/bin/jp2/CMakeLists.txt
+++ b/src/bin/jp2/CMakeLists.txt
@@ -11,11 +11,15 @@ set(common_SRCS
   ${OPENJPEG_SOURCE_DIR}/src/bin/common/color.h
   ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c
   ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.h
+  ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_string.h
   )
-  
+
 if(OPJ_HAVE_LIBTIFF)
        list(APPEND common_SRCS converttif.c)
 endif()
+if(OPJ_HAVE_LIBPNG)
+       list(APPEND common_SRCS convertpng.c)
+endif()
 
 # Headers file are located here:
 include_directories(
@@ -40,6 +44,9 @@ endif()
 # Loop over all executables:
 foreach(exe opj_decompress opj_compress opj_dump)
   add_executable(${exe} ${exe}.c ${common_SRCS})
+  if(${CMAKE_VERSION} VERSION_GREATER "2.8.11")
+    target_compile_options(${exe} PRIVATE ${OPENJP2_COMPILE_OPTIONS})
+  endif()
   target_link_libraries(${exe} ${OPENJPEG_LIBRARY_NAME}
     ${PNG_LIBNAME} ${TIFF_LIBNAME} ${LCMS_LIBNAME}
     )
@@ -53,6 +60,9 @@ foreach(exe opj_decompress opj_compress opj_dump)
   # On unix you need to link to the math library:
   if(UNIX)
     target_link_libraries(${exe} m)
+    IF("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
+      target_link_libraries(${exe} rt)
+    endif()
   endif()
   # Install exe
   install(TARGETS ${exe}
@@ -60,7 +70,7 @@ foreach(exe opj_decompress opj_compress opj_dump)
     DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
   )
   if(OPJ_USE_DSYMUTIL)
-    add_custom_command(TARGET ${exe} POST_BUILD 
+    add_custom_command(TARGET ${exe} POST_BUILD
     COMMAND "dsymutil" "$<TARGET_FILE:${exe}>"
     COMMENT "dsymutil $<TARGET_FILE:${exe}>"
     DEPENDS ${exe})