diff options
| author | Antonin Descampe <antonin@gmail.com> | 2010-10-21 09:49:54 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2010-10-21 09:49:54 +0000 |
| commit | b6102e207cdb5a7dd89494eee9628fc844f7f655 (patch) | |
| tree | be289b41c05cca2270463469d8c5f1a8d3e2943f /libopenjpeg | |
| parent | ddc9a278aafd11cb99678942c76dd5b6cc37e772 (diff) | |
fixed paths to png and tiff in CMakeLists.txt and fixed link to lcms library (patch from winfried)
Diffstat (limited to 'libopenjpeg')
| -rw-r--r-- | libopenjpeg/CMakeLists.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libopenjpeg/CMakeLists.txt b/libopenjpeg/CMakeLists.txt index c1719b7b..bc744d09 100644 --- a/libopenjpeg/CMakeLists.txt +++ b/libopenjpeg/CMakeLists.txt @@ -21,9 +21,9 @@ SET(OPENJPEG_SRCS tgt.c opj_convert.c ) - -INCLUDE_DIRECTORIES( ${LCMS_INCLUDE_DIR} ) - +IF(LCMS_INCLUDE_DIR) + INCLUDE_DIRECTORIES( ${LCMS_INCLUDE_DIR} ) +ENDIF(LCMS_INCLUDE_DIR) # Pass proper definition to preprocessor to generate shared lib IF(WIN32) IF(BUILD_SHARED_LIBS) @@ -37,7 +37,9 @@ ENDIF(WIN32) ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) - +IF(LCMS_LIB) + TARGET_LINK_LIBRARIES(${OPENJPEG_LIBRARY_NAME} ${LCMS_LIB}) +ENDIF(LCMS_LIB) # Install library INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME} EXPORT OpenJPEGTargets |