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

Cleanup jpip cmake compilation

This commit is contained in:
Mathieu Malaterre 2011-11-24 10:42:47 +00:00
parent 6e624946d2
commit c27322ff04
3 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applications/jpip/CMakeLists.txt
View File

@ -1,3 +1,3 @@
# lib and utils
ADD_SUBDIRECTORY(libopenjpip) ADD_SUBDIRECTORY(libopenjpip)
ADD_SUBDIRECTORY(util) ADD_SUBDIRECTORY(util)

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

@ -47,16 +47,18 @@ TARGET_LINK_LIBRARIES(openjpip_local ${OPENJPEG_LIBRARY_NAME})
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})
SET_TARGET_PROPERTIES(openjpip_server SET_TARGET_PROPERTIES(openjpip_server
PROPERTIES COMPILE_FLAGS "-DSERVER") PROPERTIES COMPILE_FLAGS "-DSERVER"
)
# As far as I understand the design openjpip_ libs do not have stable API
# This is why they are build as static. Thus they should NOT be installed as of yet
# Install library # Install library
INSTALL(TARGETS openjpip_local #INSTALL(TARGETS openjpip_local
EXPORT OpenJPEGTargets # EXPORT OpenJPEGTargets
DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries # DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
) # )
#
INSTALL(TARGETS openjpip_server #INSTALL(TARGETS openjpip_server
EXPORT OpenJPEGTargets # EXPORT OpenJPEGTargets
DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries # DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
) # )

16
applications/jpip/util/CMakeLists.txt
View File

@ -9,10 +9,11 @@ ${CMAKE_CURRENT_SOURCE_DIR}/opj_server.c
) )
# Build executable # Build executable
ADD_DEFINITIONS(-DSERVER -DQUIT_SIGNAL="quitJPIP")
#
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})
SET_TARGET_PROPERTIES(opj_server
PROPERTIES COMPILE_FLAGS "-DSERVER -DQUIT_SIGNAL=\\\"quitJPIP\\\""
)
# On unix you need to link to the math library: # On unix you need to link to the math library:
IF(UNIX) IF(UNIX)
@ -25,10 +26,13 @@ ENDIF(UNIX)
DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
) )
# #
REMOVE_DEFINITIONS(-DSERVER -DQUIT_SIGNAL="quitJPIP") SET(EXES
# opj_dec_server
FOREACH(exe opj_dec_server jpip_to_jp2 jpip_to_j2k test_index) jpip_to_jp2
# jpip_to_j2k
test_index
)
FOREACH(exe ${EXES})
ADD_EXECUTABLE(${exe} ${exe}.c) ADD_EXECUTABLE(${exe} ${exe}.c)
TARGET_LINK_LIBRARIES(${exe} openjpip_local) TARGET_LINK_LIBRARIES(${exe} openjpip_local)
INSTALL(TARGETS ${exe} INSTALL(TARGETS ${exe}