diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2011-06-03 13:44:58 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2011-06-03 13:44:58 +0000 |
| commit | 74583409eca710ec572e1d423672e23b9c0822af (patch) | |
| tree | 3ebc761458a5a15f68d0a6335275edb4e787ebd8 | |
| parent | 3da66d4d7905694b93456173c7665be08a986ef5 (diff) | |
Fix some error with cmake
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | applications/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | applications/codec/CMakeLists.txt | 6 |
3 files changed, 8 insertions, 3 deletions
@@ -7,6 +7,7 @@ What's New for OpenJPEG June 3, 2011 + [malaterre] adding partno and numpart info as part of the warning message (issue #69) ++ [malaterre] make sure that cmake build system works on debian May 23, 2011 * [antonin] fixed a bug in autotools that prevented "make distcheck" to work properly (credit to Vincent Torri) diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt index 43081e8f..5f413169 100644 --- a/applications/CMakeLists.txt +++ b/applications/CMakeLists.txt @@ -86,7 +86,7 @@ ENDIF() SET(HAVE_LCMS2_H 1) SET(HAVE_LIBLCMS2 1) # - ADD_SUBDIRECTORY(${OPENJPEG_SOURCE_DIR}/thirdparty) +#ADD_SUBDIRECTORY(${OPENJPEG_SOURCE_DIR}/thirdparty) # LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/thirdparty/lib) # @@ -127,4 +127,4 @@ ENDIF(BUILD_CODEC) IF(BUILD_MJ2) ADD_SUBDIRECTORY(mj2) ENDIF(BUILD_MJ2) -#
\ No newline at end of file +# diff --git a/applications/codec/CMakeLists.txt b/applications/codec/CMakeLists.txt index 37c8bb5d..44f10872 100644 --- a/applications/codec/CMakeLists.txt +++ b/applications/codec/CMakeLists.txt @@ -37,7 +37,11 @@ ENDIF(WIN32) FOREACH(exe j2k_to_image image_to_j2k j2k_dump) ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS}) TARGET_LINK_LIBRARIES(${exe} ${OPENJPEG_LIBRARY_NAME} - ${LCMS_LIBNAME} ${Z_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME}) +${Z_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME}) + + IF(LCMS_FOUND OR LCMS2_FOUND) + TARGET_LINK_LIBRARIES(${exe} ${LCMS_LIBNAME}) + ENDIF(LCMS_FOUND OR LCMS2_FOUND) ADD_TEST(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe}) # calling those exe without option will make them fail always: |