diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-25 07:53:22 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-25 07:53:22 +0000 |
| commit | 23a624f73adba55d60b1569b2c32c2b0397a4c10 (patch) | |
| tree | 191cff03e1af786d92f4789a7dfa8223b25644e5 /src/bin | |
| parent | f3d7d2f7b1b0cf41c10c48eaecdab6707780e7f1 (diff) | |
[trunk] Since r2060 (and r2059) openjpip is now a first class shared library, instead of a local static lib which expose all the symbols.
As such re-apply changes from r2077 which were removed in r2122
Also remove old code for now removed opj_jpip_compress
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/jpip/CMakeLists.txt | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt index 50772678..45f0007b 100644 --- a/src/bin/jpip/CMakeLists.txt +++ b/src/bin/jpip/CMakeLists.txt @@ -48,22 +48,7 @@ set(EXES opj_jpip_test ) foreach(exe ${EXES}) - if(${exe} STREQUAL "opj_jpip_compress") - include_directories( - ${Z_INCLUDE_DIRNAME} - ${PNG_INCLUDE_DIRNAME} - ${TIFF_INCLUDE_DIRNAME} - ) - add_executable(${exe} ${exe}.c - ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c - ${OPENJPEG_SOURCE_DIR}/src/bin/jp2/convert.c - ) - target_link_libraries(${exe} - ${PNG_LIBNAME} ${TIFF_LIBNAME} ${LCMS_LIBNAME} ${Z_LIBNAME} - ) - else() - add_executable(${exe} ${exe}.c) - endif() +add_executable(${exe} ${exe}.c) target_link_libraries(${exe} openjpip) install(TARGETS ${exe} EXPORT OpenJPEGTargets |