walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[trunk] Make openjpip a first class shared lib, for future linking

This commit is contained in:
Mathieu Malaterre 2012-10-05 17:05:06 +00:00
parent 16106b2978
commit 23f5eeec20
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/jpip/CMakeLists.txt
View File

@ -48,7 +48,7 @@ set(EXES
) )
foreach(exe ${EXES}) foreach(exe ${EXES})
add_executable(${exe} ${exe}.c) add_executable(${exe} ${exe}.c)
target_link_libraries(${exe} openjpip_local) target_link_libraries(${exe} openjpip)
install(TARGETS ${exe} install(TARGETS ${exe}
EXPORT OpenJPEGTargets EXPORT OpenJPEGTargets
DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications

21
src/lib/openjpip/CMakeLists.txt
View File

@ -56,17 +56,28 @@ set(LOCAL_SRCS
) )
# Build the library # Build the library
add_library(openjpip_local STATIC ${OPENJPIP_SRCS} ${LOCAL_SRCS}) if(WIN32)
target_link_libraries(openjpip_local ${OPENJPEG_LIBRARY_NAME}) if(BUILD_SHARED_LIBS)
add_definitions(-DOPJ_EXPORTS)
else()
add_definitions(-DOPJ_STATIC)
endif()
endif()
add_library(openjpip ${OPENJPIP_SRCS} ${LOCAL_SRCS})
set_target_properties(openjpip
PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
target_link_libraries(openjpip ${OPENJPEG_LIBRARY_NAME})
if(WIN32) if(WIN32)
# add Winsock on windows+mingw # add Winsock on windows+mingw
target_link_libraries(openjpip_local ws2_32) target_link_libraries(openjpip ws2_32)
endif() endif()
# Install library # Install library
install(TARGETS openjpip_local install(TARGETS openjpip
EXPORT OpenJPEGTargets EXPORT OpenJPEGTargets
DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
) )
if(BUILD_JPIP_SERVER) if(BUILD_JPIP_SERVER)