backport r870 to branch openjpeg-1.5

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).
 

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)

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
 

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")

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