Merge pull request #706 from mayeut/issue135

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

diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt
index a353a8f8fb6eeef841cb9e8492d5bdf4957b10b8..d583c2e6bb16c9e6b46893d97eeb202369b50d7a 100644 (file)
--- a/src/bin/jp2/CMakeLists.txt
+++ b/src/bin/jp2/CMakeLists.txt
@@ -3,10 +3,23 @@
 # First thing define the common source:
 set(common_SRCS
   convert.c
+  convert.h
+  convertbmp.c
   index.c
+  index.h
   ${OPENJPEG_SOURCE_DIR}/src/bin/common/color.c
+  ${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(
@@ -51,10 +64,9 @@ foreach(exe opj_decompress opj_compress opj_dump)
     DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
   )
   if(OPJ_USE_DSYMUTIL)
-    GET_TARGET_PROPERTY(EXE_LOCATION ${exe} LOCATION)
     add_custom_command(TARGET ${exe} POST_BUILD 
-    COMMAND "dsymutil" "${EXE_LOCATION}"
-    COMMENT "dsymutil ${EXE_LOCATION}"
+    COMMAND "dsymutil" "$<TARGET_FILE:${exe}>"
+    COMMENT "dsymutil $<TARGET_FILE:${exe}>"
     DEPENDS ${exe})
   endif()
 endforeach()