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

backport r870 to branch openjpeg-1.5

This commit is contained in:
Antonin Descampe 2011-08-16 08:54:54 +00:00
parent 61e0ed6a96
commit 4091882dfb
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

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

2
CMake/FindFCGI.cmake
View File

@ -10,7 +10,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(FCGI DEFAULT_MSG FCGI_LIBRARY FCGI_INCLUDE_DIR
# Copy the results to the output variables. # Copy the results to the output variables.
IF(FCGI_FOUND) IF(FCGI_FOUND)
SET( ${FCGI_LIBRARY}) SET(FCGI_LIBRARIES ${FCGI_LIBRARY})
SET(FCGI_INCLUDE_DIRS ${FCGI_INCLUDE_DIR}) SET(FCGI_INCLUDE_DIRS ${FCGI_INCLUDE_DIR})
ELSE(FCGI_FOUND) ELSE(FCGI_FOUND)
SET(FCGI_LIBRARIES) SET(FCGI_LIBRARIES)

3
applications/jpip/CHANGES
View File

@ -5,6 +5,9 @@ What's New for OpenJPIP
! : changed ! : changed
+ : added + : added
August 16, 2011
* [antonin] fixed cmake support for openjpip
August 12, 2011 August 12, 2011
+ [antonin] added cmake support to openjpip + [antonin] added cmake support to openjpip

4
applications/jpip/libopenjpip/CMakeLists.txt
View File

@ -24,9 +24,9 @@ ${CMAKE_CURRENT_SOURCE_DIR}/target_manager.c
) )
# Build the library # 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}) TARGET_LINK_LIBRARIES(openjpip_server ${FCGI_LIBNAME})
SET_TARGET_PROPERTIES(openjpip_server SET_TARGET_PROPERTIES(openjpip_server
PROPERTIES COMPILE_FLAGS "-DSERVER") PROPERTIES COMPILE_FLAGS "-DSERVER")

6
applications/jpip/opj_server/CMakeLists.txt
View File

@ -1,19 +1,18 @@
# Headers file are located here: # Headers file are located here:
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${OPENJPEG_SOURCE_DIR}/applications/jpip/libopenjpip
${FCGI_INCLUDE_DIRNAME} ${FCGI_INCLUDE_DIRNAME}
../libopenjpip
) )
SET(OPJ_SERVER_SRCS SET(OPJ_SERVER_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/channel_manager.c
${CMAKE_CURRENT_SOURCE_DIR}/opj_server.c ${CMAKE_CURRENT_SOURCE_DIR}/opj_server.c
${CMAKE_CURRENT_SOURCE_DIR}/query_parser.c ${CMAKE_CURRENT_SOURCE_DIR}/query_parser.c
${CMAKE_CURRENT_SOURCE_DIR}/channel_manager.c
${CMAKE_CURRENT_SOURCE_DIR}/session_manager.c ${CMAKE_CURRENT_SOURCE_DIR}/session_manager.c
) )
# Build executable # Build executable
ADD_DEFINITIONS(-DSERVER) ADD_DEFINITIONS(-DSERVER)
ADD_EXECUTABLE(opj_server ${OPJ_SERVER_SRCS}) ADD_EXECUTABLE(opj_server ${OPJ_SERVER_SRCS})
TARGET_LINK_LIBRARIES(opj_server openjpip_server ${FCGI_LIBNAME}) TARGET_LINK_LIBRARIES(opj_server openjpip_server ${FCGI_LIBNAME})
@ -22,6 +21,7 @@ TARGET_LINK_LIBRARIES(opj_server openjpip_server ${FCGI_LIBNAME})
IF(UNIX) IF(UNIX)
TARGET_LINK_LIBRARIES(opj_server m) TARGET_LINK_LIBRARIES(opj_server m)
ENDIF(UNIX) ENDIF(UNIX)
# Install exe # Install exe
INSTALL(TARGETS opj_server INSTALL(TARGETS opj_server
EXPORT OpenJPEGTargets EXPORT OpenJPEGTargets