diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2011-12-12 09:42:44 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2011-12-12 09:42:44 +0000 |
| commit | a13abdaf65d854440a53a875a6519c0b5f686c4e (patch) | |
| tree | bb6a7529c9fd1b28ffb97be6bb1eb1521c584695 /applications | |
| parent | 72867bc692ff984ba76484e12b1cb7b3dcbda2d1 (diff) | |
Sync with trunk
Diffstat (limited to 'applications')
| -rw-r--r-- | applications/jpip/util/CMakeLists.txt | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/applications/jpip/util/CMakeLists.txt b/applications/jpip/util/CMakeLists.txt index eba94e37..52a427ce 100644 --- a/applications/jpip/util/CMakeLists.txt +++ b/applications/jpip/util/CMakeLists.txt @@ -5,14 +5,15 @@ INCLUDE_DIRECTORIES( ) SET(OPJ_SERVER_SRCS -${CMAKE_CURRENT_SOURCE_DIR}/opj_server.c -) + ${CMAKE_CURRENT_SOURCE_DIR}/opj_server.c + ) # Build executable -ADD_DEFINITIONS(-DSERVER -DQUIT_SIGNAL="quitJPIP") -# ADD_EXECUTABLE(opj_server ${OPJ_SERVER_SRCS}) 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: IF(UNIX) @@ -20,19 +21,22 @@ IF(UNIX) ENDIF(UNIX) # Install exe - INSTALL(TARGETS opj_server - EXPORT OpenJPEGTargets - DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications - ) -# -REMOVE_DEFINITIONS(-DSERVER -DQUIT_SIGNAL="quitJPIP") -# -FOREACH(exe opj_dec_server jpip_to_jp2 jpip_to_j2k test_index) +INSTALL(TARGETS opj_server + EXPORT OpenJPEGTargets + DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications + ) # - ADD_EXECUTABLE(${exe} ${exe}.c) - TARGET_LINK_LIBRARIES(${exe} openjpip_local) - INSTALL(TARGETS ${exe} - EXPORT OpenJPEGTargets - DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications +SET(EXES + opj_dec_server + jpip_to_jp2 + jpip_to_j2k + test_index ) +FOREACH(exe ${EXES}) + ADD_EXECUTABLE(${exe} ${exe}.c) + TARGET_LINK_LIBRARIES(${exe} openjpip_local) + INSTALL(TARGETS ${exe} + EXPORT OpenJPEGTargets + DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications + ) ENDFOREACH(exe) |