From 3280dc344f44c501e43d1fdfc27936f4220fe3a7 Mon Sep 17 00:00:00 2001
From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Wed, 21 Dec 2011 09:53:08 +0000
Subject: [PATCH] Make sure to append the compile def

---
 applications/jpip/libopenjpip/CMakeLists.txt | 81 ++++++++++----------
 applications/jpip/util/CMakeLists.txt        |  6 +-
 2 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/applications/jpip/libopenjpip/CMakeLists.txt b/applications/jpip/libopenjpip/CMakeLists.txt
index df07b819..fa89e7cf 100644
--- a/applications/jpip/libopenjpip/CMakeLists.txt
+++ b/applications/jpip/libopenjpip/CMakeLists.txt
@@ -8,40 +8,40 @@ INCLUDE_DIRECTORIES(
 
 # Defines the source code for the library
 SET(OPENJPIP_SRCS
-${CMAKE_CURRENT_SOURCE_DIR}/boxheader_manager.c
-${CMAKE_CURRENT_SOURCE_DIR}/codestream_manager.c
-${CMAKE_CURRENT_SOURCE_DIR}/imgreg_manager.c
-${CMAKE_CURRENT_SOURCE_DIR}/marker_manager.c
-${CMAKE_CURRENT_SOURCE_DIR}/msgqueue_manager.c
-${CMAKE_CURRENT_SOURCE_DIR}/box_manager.c
-${CMAKE_CURRENT_SOURCE_DIR}/faixbox_manager.c
-${CMAKE_CURRENT_SOURCE_DIR}/index_manager.c
-${CMAKE_CURRENT_SOURCE_DIR}/metadata_manager.c
-${CMAKE_CURRENT_SOURCE_DIR}/placeholder_manager.c
-${CMAKE_CURRENT_SOURCE_DIR}/byte_manager.c
-${CMAKE_CURRENT_SOURCE_DIR}/ihdrbox_manager.c
-${CMAKE_CURRENT_SOURCE_DIR}/manfbox_manager.c
-${CMAKE_CURRENT_SOURCE_DIR}/mhixbox_manager.c
-${CMAKE_CURRENT_SOURCE_DIR}/target_manager.c
-${CMAKE_CURRENT_SOURCE_DIR}/cachemodel_manager.c
-${CMAKE_CURRENT_SOURCE_DIR}/j2kheader_manager.c
-${CMAKE_CURRENT_SOURCE_DIR}/jp2k_encoder.c
-${CMAKE_CURRENT_SOURCE_DIR}/openjpip.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}/jpip_parser.c
-${CMAKE_CURRENT_SOURCE_DIR}/sock_manager.c
-${CMAKE_CURRENT_SOURCE_DIR}/auxtrans_manager.c
-)
+  ${CMAKE_CURRENT_SOURCE_DIR}/boxheader_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/codestream_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/imgreg_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/marker_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/msgqueue_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/box_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/faixbox_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/index_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/metadata_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/placeholder_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/byte_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ihdrbox_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/manfbox_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/mhixbox_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/target_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/cachemodel_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/j2kheader_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/jp2k_encoder.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/openjpip.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}/jpip_parser.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/sock_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/auxtrans_manager.c
+  )
 
 SET(LOCAL_SRCS
-${CMAKE_CURRENT_SOURCE_DIR}/jp2k_decoder.c
-${CMAKE_CURRENT_SOURCE_DIR}/imgsock_manager.c
-${CMAKE_CURRENT_SOURCE_DIR}/jpipstream_manager.c
-${CMAKE_CURRENT_SOURCE_DIR}/cache_manager.c
-${CMAKE_CURRENT_SOURCE_DIR}/dec_clientmsg_handler.c
-)
+  ${CMAKE_CURRENT_SOURCE_DIR}/jp2k_decoder.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/imgsock_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/jpipstream_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/cache_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/dec_clientmsg_handler.c
+  )
 
 # Build the library
 ADD_LIBRARY(openjpip_local STATIC ${OPENJPIP_SRCS} ${LOCAL_SRCS})
@@ -52,14 +52,13 @@ TARGET_LINK_LIBRARIES(openjpip_server ${FCGI_LIBNAME} ${CURL_LIBRARIES})
 SET_TARGET_PROPERTIES(openjpip_server
   PROPERTIES COMPILE_FLAGS "-DSERVER")
 
-
 # Install library
- INSTALL(TARGETS openjpip_local
-   EXPORT OpenJPEGTargets
-   DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
- )
+INSTALL(TARGETS openjpip_local
+  EXPORT OpenJPEGTargets
+  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
+  )
 
- INSTALL(TARGETS openjpip_server
-   EXPORT OpenJPEGTargets
-   DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
- )
+INSTALL(TARGETS openjpip_server
+  EXPORT OpenJPEGTargets
+  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
+  )
diff --git a/applications/jpip/util/CMakeLists.txt b/applications/jpip/util/CMakeLists.txt
index 52a427ce..1cd23229 100644
--- a/applications/jpip/util/CMakeLists.txt
+++ b/applications/jpip/util/CMakeLists.txt
@@ -11,8 +11,10 @@ SET(OPJ_SERVER_SRCS
 # Build executable
 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\\\""
+SET_PROPERTY(
+  TARGET opj_server
+  APPEND PROPERTY
+  COMPILE_DEFINITIONS SERVER QUIT_SIGNAL="quitJPIP"
   )
 
 # On unix you need to link to the math library: