diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-09-28 09:26:51 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-09-28 09:26:51 +0000 |
| commit | 95f06f0591976f4a8534c73251fe5048bbe7f770 (patch) | |
| tree | a5a890c829feecb4143cafedac5a05cd00545a56 /src/bin/jp2 | |
| parent | 3bf4d635f2401f5749c33aa4bac0b5268e687008 (diff) | |
[trunk] FolderReorgProposal task: fix JPWL
Update issue 177
Diffstat (limited to 'src/bin/jp2')
| -rw-r--r-- | src/bin/jp2/CMakeLists.txt | 56 |
1 files changed, 1 insertions, 55 deletions
diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt index f25b8470..62047e42 100644 --- a/src/bin/jp2/CMakeLists.txt +++ b/src/bin/jp2/CMakeLists.txt @@ -11,8 +11,8 @@ set(common_SRCS # Headers file are located here: include_directories( ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2 - ${LCMS_INCLUDE_DIRNAME} ${OPENJPEG_SOURCE_DIR}/src/bin/common + ${LCMS_INCLUDE_DIRNAME} ${Z_INCLUDE_DIRNAME} ${PNG_INCLUDE_DIRNAME} ${TIFF_INCLUDE_DIRNAME} @@ -57,57 +57,3 @@ install( ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1 DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1) # - -if(BUILD_JPWL) - add_executable(JPWL_j2k_to_image - j2k_to_image.c - ${common_SRCS} - ) - - set_property( - TARGET JPWL_j2k_to_image - APPEND PROPERTY COMPILE_DEFINITIONS USE_JPWL - ) - - target_link_libraries(JPWL_j2k_to_image ${OPENJPEG_LIBRARY_NAME}_JPWL - ${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() - - if(UNIX) - target_link_libraries(JPWL_j2k_to_image m) - endif() - - add_executable(JPWL_image_to_j2k - image_to_j2k.c - ${common_SRCS} - ) - - set_property( - TARGET JPWL_image_to_j2k - APPEND PROPERTY COMPILE_DEFINITIONS USE_JPWL - ) - - target_link_libraries(JPWL_image_to_j2k ${OPENJPEG_LIBRARY_NAME}_JPWL - ${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() - - if(UNIX) - target_link_libraries(JPWL_image_to_j2k m) - endif() - - install(TARGETS JPWL_image_to_j2k JPWL_j2k_to_image - DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications - ) -endif() |