diff options
| author | Antonin Descampe <antonin@gmail.com> | 2011-08-16 08:54:54 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2011-08-16 08:54:54 +0000 |
| commit | 4091882dfbd90b67d81cdaf774cfcbdb79cbe2ee (patch) | |
| tree | fba9354c63d10024637df0e561e7706da057b71e /applications | |
| parent | 61e0ed6a964bf068a26a072298f5e0a3664461f0 (diff) | |
backport r870 to branch openjpeg-1.5
Diffstat (limited to 'applications')
| -rw-r--r-- | applications/jpip/CHANGES | 3 | ||||
| -rw-r--r-- | applications/jpip/libopenjpip/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | applications/jpip/opj_server/CMakeLists.txt | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/applications/jpip/CHANGES b/applications/jpip/CHANGES index 755c205d..94d0359f 100644 --- a/applications/jpip/CHANGES +++ b/applications/jpip/CHANGES @@ -5,6 +5,9 @@ What's New for OpenJPIP ! : changed + : added +August 16, 2011 +* [antonin] fixed cmake support for openjpip + August 12, 2011 + [antonin] added cmake support to openjpip diff --git a/applications/jpip/libopenjpip/CMakeLists.txt b/applications/jpip/libopenjpip/CMakeLists.txt index 3f42af7c..b61edf94 100644 --- a/applications/jpip/libopenjpip/CMakeLists.txt +++ b/applications/jpip/libopenjpip/CMakeLists.txt @@ -24,9 +24,9 @@ ${CMAKE_CURRENT_SOURCE_DIR}/target_manager.c ) # Build the library -ADD_LIBRARY(openjpip_local ${OPENJPIP_SRCS}) +ADD_LIBRARY(openjpip_local STATIC ${OPENJPIP_SRCS}) -ADD_LIBRARY(openjpip_server ${OPENJPIP_SRCS}) +ADD_LIBRARY(openjpip_server STATIC ${OPENJPIP_SRCS}) TARGET_LINK_LIBRARIES(openjpip_server ${FCGI_LIBNAME}) SET_TARGET_PROPERTIES(openjpip_server PROPERTIES COMPILE_FLAGS "-DSERVER") diff --git a/applications/jpip/opj_server/CMakeLists.txt b/applications/jpip/opj_server/CMakeLists.txt index c7bcedc5..29007e1b 100644 --- a/applications/jpip/opj_server/CMakeLists.txt +++ b/applications/jpip/opj_server/CMakeLists.txt @@ -1,19 +1,18 @@ # Headers file are located here: INCLUDE_DIRECTORIES( + ${OPENJPEG_SOURCE_DIR}/applications/jpip/libopenjpip ${FCGI_INCLUDE_DIRNAME} - ../libopenjpip ) SET(OPJ_SERVER_SRCS -${CMAKE_CURRENT_SOURCE_DIR}/channel_manager.c ${CMAKE_CURRENT_SOURCE_DIR}/opj_server.c ${CMAKE_CURRENT_SOURCE_DIR}/query_parser.c +${CMAKE_CURRENT_SOURCE_DIR}/channel_manager.c ${CMAKE_CURRENT_SOURCE_DIR}/session_manager.c ) # Build executable - ADD_DEFINITIONS(-DSERVER) ADD_EXECUTABLE(opj_server ${OPJ_SERVER_SRCS}) TARGET_LINK_LIBRARIES(opj_server openjpip_server ${FCGI_LIBNAME}) @@ -22,6 +21,7 @@ TARGET_LINK_LIBRARIES(opj_server openjpip_server ${FCGI_LIBNAME}) IF(UNIX) TARGET_LINK_LIBRARIES(opj_server m) ENDIF(UNIX) + # Install exe INSTALL(TARGETS opj_server EXPORT OpenJPEGTargets |