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

fix compilation of libopenjpip (libcurl dependency) with CMake. Credit to Winfried.

This commit is contained in:
Vincent Torri 2011-11-19 07:16:14 +00:00
parent 01749cb8a2
commit 0c350f4908
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@ -5,8 +5,11 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : added
November 19, 2011
* [vincent] fix compilation of libopenjpip (libcurl dependency) with CMake. Credit to Winfried.
November 16, 2011 November 16, 2011
* [vincent] fix compilation of libopenjpip (libcurl dependency) and fix 'distcheck' rule * [vincent] fix compilation of libopenjpip (libcurl dependency) with the autotools and fix 'distcheck' rule
October 21, 2011 October 21, 2011
* [mickael] remove one obvious memory leak from test functions * [mickael] remove one obvious memory leak from test functions

11
CMakeLists.txt
View File

@ -210,6 +210,17 @@ OPTION(BUILD_CODEC "Build the CODEC executables" ON)
OPTION(BUILD_MJ2 "Build the MJ2 executables." OFF) OPTION(BUILD_MJ2 "Build the MJ2 executables." OFF)
OPTION(BUILD_JPIP "Build the JPIP library and executables." OFF) OPTION(BUILD_JPIP "Build the JPIP library and executables." OFF)
IF(BUILD_JPIP)
FIND_PACKAGE(CURL)
ENDIF (BUILD_JPIP)
IF(NOT CURL_FOUND)
IF(BUILD_JPIP)
message(WARNING "You must have libcurl installed to use JPIP")
ENDIF (BUILD_JPIP)
SET(BUILD_JPIP OFF)
ENDIF (NOT CURL_FOUND)
IF(BUILD_CODEC OR BUILD_MJ2 OR BUILD_JPIP) IF(BUILD_CODEC OR BUILD_MJ2 OR BUILD_JPIP)
OPTION(BUILD_THIRDPARTY "Build the thirdparty executables if it is needed" OFF) OPTION(BUILD_THIRDPARTY "Build the thirdparty executables if it is needed" OFF)
ADD_SUBDIRECTORY(thirdparty) ADD_SUBDIRECTORY(thirdparty)

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

@ -3,6 +3,7 @@ INCLUDE_REGULAR_EXPRESSION("^.*$")
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${OPENJPEG_SOURCE_DIR}/libopenjpeg ${OPENJPEG_SOURCE_DIR}/libopenjpeg
${FCGI_INCLUDE_DIRNAME} ${FCGI_INCLUDE_DIRNAME}
${CURL_INCLUDE_DIRS}
) )
# Defines the source code for the library # Defines the source code for the library
@ -42,10 +43,10 @@ ${CMAKE_CURRENT_SOURCE_DIR}/dec_clientmsg_handler.c
# Build the library # Build the library
ADD_LIBRARY(openjpip_local STATIC ${OPENJPIP_SRCS} ${LOCAL_SRCS}) ADD_LIBRARY(openjpip_local STATIC ${OPENJPIP_SRCS} ${LOCAL_SRCS})
TARGET_LINK_LIBRARIES(openjpip_local ${OPENJPEG_LIBRARY_NAME}) TARGET_LINK_LIBRARIES(openjpip_local ${OPENJPEG_LIBRARY_NAME} ${CURL_LIBRARIES})
ADD_LIBRARY(openjpip_server STATIC ${OPENJPIP_SRCS}) ADD_LIBRARY(openjpip_server STATIC ${OPENJPIP_SRCS})
TARGET_LINK_LIBRARIES(openjpip_server ${FCGI_LIBNAME}) TARGET_LINK_LIBRARIES(openjpip_server ${FCGI_LIBNAME} ${CURL_LIBRARIES})
SET_TARGET_PROPERTIES(openjpip_server SET_TARGET_PROPERTIES(openjpip_server
PROPERTIES COMPILE_FLAGS "-DSERVER") PROPERTIES COMPILE_FLAGS "-DSERVER")