diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-05 17:05:06 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-05 17:05:06 +0000 |
| commit | 23f5eeec20e853c5534df735d9263befda9b0135 (patch) | |
| tree | 4fc3dbc6eddf57179c81d2ecfc942ed47650663f /src | |
| parent | 16106b297844ff3932bf211de99441c505eb762d (diff) | |
[trunk] Make openjpip a first class shared lib, for future linking
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/jpip/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/lib/openjpip/CMakeLists.txt | 21 |
2 files changed, 17 insertions, 6 deletions
diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt index 6106e0d2..f1433887 100644 --- a/src/bin/jpip/CMakeLists.txt +++ b/src/bin/jpip/CMakeLists.txt @@ -48,7 +48,7 @@ set(EXES ) foreach(exe ${EXES}) add_executable(${exe} ${exe}.c) - target_link_libraries(${exe} openjpip_local) + target_link_libraries(${exe} openjpip) install(TARGETS ${exe} EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications diff --git a/src/lib/openjpip/CMakeLists.txt b/src/lib/openjpip/CMakeLists.txt index 47eb24ac..814d2931 100644 --- a/src/lib/openjpip/CMakeLists.txt +++ b/src/lib/openjpip/CMakeLists.txt @@ -56,17 +56,28 @@ set(LOCAL_SRCS ) # Build the library -add_library(openjpip_local STATIC ${OPENJPIP_SRCS} ${LOCAL_SRCS}) -target_link_libraries(openjpip_local ${OPENJPEG_LIBRARY_NAME}) +if(WIN32) + 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) # add Winsock on windows+mingw - target_link_libraries(openjpip_local ws2_32) + target_link_libraries(openjpip ws2_32) endif() # Install library -install(TARGETS openjpip_local +install(TARGETS openjpip 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) |