diff options
| author | Antonin Descampe <antonin@gmail.com> | 2011-03-20 22:45:24 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2011-03-20 22:45:24 +0000 |
| commit | 19f9147e1076d83dd1111609ca93a01085dbfb4f (patch) | |
| tree | 8ba9fe2ac562b474f627c3ae8c90eefb7d0435a3 /jpwl | |
| parent | 6bda73eeb2134963f64c3d67fdd11c1304cb14f9 (diff) | |
Removed the libs directory containing win32 compiled versions of libpng, libtiff and liblcms. Added a thirdparty directory to include main source files of libtiff, libpng, libz and liblcms to enable support of these formats in the codec executables. CMake will try to statically build these libraries if they are not found on the system. Note that these third party libraries are not required to build libopenjpeg (which has no dependencies).
Diffstat (limited to 'jpwl')
| -rwxr-xr-x | jpwl/CMakeLists.txt | 38 |
1 files changed, 12 insertions, 26 deletions
diff --git a/jpwl/CMakeLists.txt b/jpwl/CMakeLists.txt index 783921d7..7dbb3d68 100755 --- a/jpwl/CMakeLists.txt +++ b/jpwl/CMakeLists.txt @@ -39,7 +39,8 @@ IF(WIN32) ENDIF(BUILD_SHARED_LIBS) ENDIF(WIN32) ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME}_JPWL ${JPWL_SRCS} ${OPJ_SRCS}) -SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME}_JPWL PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) +SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME}_JPWL + PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) # Install library INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}_JPWL @@ -51,19 +52,12 @@ INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}_JPWL INCLUDE_DIRECTORIES( ${OPENJPEG_SOURCE_DIR}/libopenjpeg ${OPENJPEG_SOURCE_DIR}/common + ${ZLIB_INCLUDE_DIRNAME} + ${LCMS_INCLUDE_DIRNAME} + ${PNG_INCLUDE_DIRNAME} + ${TIFF_INCLUDE_DIRNAME} ) -IF(LCMS_INCLUDE_DIR) - INCLUDE_DIRECTORIES( ${LCMS_INCLUDE_DIR} ) -ENDIF(LCMS_INCLUDE_DIR) -IF(PNG_FOUND) - INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) -ENDIF(PNG_FOUND) -IF(TIFF_FOUND) - INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) -ENDIF(TIFF_FOUND) - - ADD_EXECUTABLE(JPWL_j2k_to_image ../codec/j2k_to_image.c ../codec/convert.c @@ -72,13 +66,9 @@ ${OPENJPEG_SOURCE_DIR}/common/color.c ${common_SRCS} ) -TARGET_LINK_LIBRARIES(JPWL_j2k_to_image ${OPENJPEG_LIBRARY_NAME}_JPWL ${LCMS_LIB}) -IF(PNG_FOUND) - TARGET_LINK_LIBRARIES(JPWL_j2k_to_image ${PNG_LIBRARIES}) -ENDIF(PNG_FOUND) -IF(TIFF_FOUND) - TARGET_LINK_LIBRARIES(JPWL_j2k_to_image ${TIFF_LIBRARIES}) -ENDIF(TIFF_FOUND) +TARGET_LINK_LIBRARIES(JPWL_j2k_to_image ${OPENJPEG_LIBRARY_NAME}_JPWL + ${LCMS_LIBNAME} ${Z_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME}) +# IF(UNIX) TARGET_LINK_LIBRARIES(JPWL_j2k_to_image m) ENDIF(UNIX) @@ -91,13 +81,9 @@ ADD_EXECUTABLE(JPWL_image_to_j2k ${common_SRCS} ) -TARGET_LINK_LIBRARIES(JPWL_image_to_j2k ${OPENJPEG_LIBRARY_NAME}_JPWL ${LCMS_LIB}) -IF(PNG_FOUND) - TARGET_LINK_LIBRARIES(JPWL_image_to_j2k ${PNG_LIBRARIES}) -ENDIF(PNG_FOUND) -IF(TIFF_FOUND) - TARGET_LINK_LIBRARIES(JPWL_image_to_j2k ${TIFF_LIBRARIES}) -ENDIF(TIFF_FOUND) +TARGET_LINK_LIBRARIES(JPWL_image_to_j2k ${OPENJPEG_LIBRARY_NAME}_JPWL + ${LCMS_LIBNAME} ${Z_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME}) +# IF(UNIX) TARGET_LINK_LIBRARIES(JPWL_image_to_j2k m) ENDIF(UNIX) |