Sync with trunk

This commit is contained in:
Mathieu Malaterre 2011-12-12 09:42:44 +00:00
parent 72867bc692
commit a13abdaf65
1 changed files with 22 additions and 18 deletions

View File

@ -5,14 +5,15 @@ INCLUDE_DIRECTORIES(
) )
SET(OPJ_SERVER_SRCS SET(OPJ_SERVER_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/opj_server.c ${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)
@ -20,15 +21,18 @@ IF(UNIX)
ENDIF(UNIX) ENDIF(UNIX)
# Install exe # Install exe
INSTALL(TARGETS opj_server INSTALL(TARGETS opj_server
EXPORT OpenJPEGTargets EXPORT OpenJPEGTargets
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}