diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-03-02 14:31:46 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-03-02 14:31:46 +0000 |
| commit | a06b7f2ae0326489aed4e91fb5ddef73224cb19e (patch) | |
| tree | 683df11ea29242698086946a09bcdf606db0e33c /libopenjpeg | |
| parent | 405b1067e24293ae2a89a0280712a8aea3d073bd (diff) | |
[trunk] Sync with 1.5 branch
Diffstat (limited to 'libopenjpeg')
| -rwxr-xr-x | libopenjpeg/jpwl/CMakeLists.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libopenjpeg/jpwl/CMakeLists.txt b/libopenjpeg/jpwl/CMakeLists.txt index 52411779..f8512cda 100755 --- a/libopenjpeg/jpwl/CMakeLists.txt +++ b/libopenjpeg/jpwl/CMakeLists.txt @@ -3,6 +3,12 @@ ADD_DEFINITIONS(-DUSE_JPWL) SET(JPWL_SRCS crc.c jpwl.c jpwl_lib.c rs.c) +IF(APPLE) + SET_SOURCE_FILES_PROPERTIES( + rs.c + PROPERTIES + COMPILE_FLAGS -fno-common) +ENDIF(APPLE) INCLUDE_DIRECTORIES( ${OPENJPEG_SOURCE_DIR}/libopenjpeg @@ -22,5 +28,8 @@ SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME}_JPWL # Install library INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}_JPWL - DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries + EXPORT OpenJPEGTargets + RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications + LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries + ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries ) |