projects
/
openjpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 46943c5ed7c575bfa4101dcdf08a16af39757582..d583c2e6bb16c9e6b46893d97eeb202369b50d7a 100644
(file)
--- a/
src/bin/jp2/CMakeLists.txt
+++ b/
src/bin/jp2/CMakeLists.txt
@@
-3,14
+3,28
@@
# First thing define the common source:
set(common_SRCS
convert.c
# First thing define the common source:
set(common_SRCS
convert.c
+ convert.h
+ convertbmp.c
index.c
index.c
+ index.h
${OPENJPEG_SOURCE_DIR}/src/bin/common/color.c
${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.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(
${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
# Headers file are located here:
include_directories(
${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
+ ${OPENJPEG_BINARY_DIR}/src/bin/common # opj_apps_config.h
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
${OPENJPEG_SOURCE_DIR}/src/bin/common
${LCMS_INCLUDE_DIRNAME}
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
${OPENJPEG_SOURCE_DIR}/src/bin/common
${LCMS_INCLUDE_DIRNAME}
@@
-36,7
+50,7
@@
foreach(exe opj_decompress opj_compress opj_dump)
# To support universal exe:
if(ZLIB_FOUND AND APPLE)
target_link_libraries(${exe} z)
# To support universal exe:
if(ZLIB_FOUND AND APPLE)
target_link_libraries(${exe} z)
-
ELS
e(ZLIB_FOUND AND APPLE)
+
els
e(ZLIB_FOUND AND APPLE)
target_link_libraries(${exe} ${Z_LIBNAME})
endif()
target_link_libraries(${exe} ${Z_LIBNAME})
endif()
@@
-49,8
+63,15
@@
foreach(exe opj_decompress opj_compress opj_dump)
EXPORT OpenJPEGTargets
DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
)
EXPORT OpenJPEGTargets
DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
)
+ if(OPJ_USE_DSYMUTIL)
+ add_custom_command(TARGET ${exe} POST_BUILD
+ COMMAND "dsymutil" "$<TARGET_FILE:${exe}>"
+ COMMENT "dsymutil $<TARGET_FILE:${exe}>"
+ DEPENDS ${exe})
+ endif()
endforeach()
endforeach()
+if(BUILD_DOC)
# Install man pages
install(
FILES ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1
# Install man pages
install(
FILES ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1
@@
-58,3
+79,4
@@
install(
${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1
DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
#
${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1
DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
#
+endif()