backport r870 to branch openjpeg-1.5

diff --git a/CHANGES b/CHANGES
index 5b213558608f252f06bc0fcdb2703b19a94eae0d..7ba390519faf3d2d4c32c253328974ea76b3acd9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+August 16, 2011
+* [antonin] fixed cmake support for openjpip
+
 August 15, 2011
 * [antonin] fixed a bug in autotools files that prevented libfcgi to be correctly found in some cases (patch from V.Torri).
 

diff --git a/CMake/FindFCGI.cmake b/CMake/FindFCGI.cmake
index ff7627753be57014bea2474b2806cd64ce171215..fa909235311480da1eaf3834a09a8a43501065ae 100644 (file)
--- a/CMake/FindFCGI.cmake
+++ b/CMake/FindFCGI.cmake
@@ -10,7 +10,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(FCGI DEFAULT_MSG FCGI_LIBRARY FCGI_INCLUDE_DIR
 
 # Copy the results to the output variables.
 IF(FCGI_FOUND)
-       SET( ${FCGI_LIBRARY})
+       SET(FCGI_LIBRARIES ${FCGI_LIBRARY})
        SET(FCGI_INCLUDE_DIRS ${FCGI_INCLUDE_DIR})
 ELSE(FCGI_FOUND)
        SET(FCGI_LIBRARIES)

diff --git a/applications/jpip/CHANGES b/applications/jpip/CHANGES
index 755c205ddfbfd28d94c5d84a8457eaf67b88320b..94d0359f3fd3c354c1a4b444db7ba845efcc8a28 100644 (file)
--- 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 3f42af7cc3df790ac0ea18973e1fa7b8b7613462..b61edf94a0218f20d6c8406ecba00f13c47f2838 100644 (file)
--- 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 c7bcedc54d1c701b607953e99ead368dd7bd8140..29007e1b7c73a9135941bb6b5adc081c71e50dcf 100644 (file)
--- 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