diff options
| author | Antonin Descampe <antonin@gmail.com> | 2012-01-25 16:30:03 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2012-01-25 16:30:03 +0000 |
| commit | 040c9a68b685facb6e36751d1ff07b21cc8ded6d (patch) | |
| tree | 562eb0f8baa6c59dc55fdc1478d45286094760df /applications/codec | |
| parent | 2b746a71cb09b9322505b27e2134c868e39067cd (diff) | |
[1.5] remove pthread dependency in JPIP client and tweak thirdparty stuff
Diffstat (limited to 'applications/codec')
| -rw-r--r-- | applications/codec/CMakeLists.txt | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/applications/codec/CMakeLists.txt b/applications/codec/CMakeLists.txt index 31009c34..2a195155 100644 --- a/applications/codec/CMakeLists.txt +++ b/applications/codec/CMakeLists.txt @@ -70,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) @@ -87,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) |