[trunk] Sync with 1.5 branch
This commit is contained in:
parent
405b1067e2
commit
a06b7f2ae0
|
@ -3,6 +3,12 @@
|
||||||
ADD_DEFINITIONS(-DUSE_JPWL)
|
ADD_DEFINITIONS(-DUSE_JPWL)
|
||||||
|
|
||||||
SET(JPWL_SRCS crc.c jpwl.c jpwl_lib.c rs.c)
|
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(
|
INCLUDE_DIRECTORIES(
|
||||||
${OPENJPEG_SOURCE_DIR}/libopenjpeg
|
${OPENJPEG_SOURCE_DIR}/libopenjpeg
|
||||||
|
@ -22,5 +28,8 @@ SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME}_JPWL
|
||||||
|
|
||||||
# Install library
|
# Install library
|
||||||
INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}_JPWL
|
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
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue