comparison CMakeLists.txt @ 1951:01de36d949c3

Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 05 Apr 2016 14:45:55 +0200
parents 6c73df12ca51
children e39a2657f1c6
comparison
equal deleted inserted replaced
1950:533ff46e944b 1951:01de36d949c3
30 SET(ENABLE_JPEG ON CACHE BOOL "Enable JPEG decompression") 30 SET(ENABLE_JPEG ON CACHE BOOL "Enable JPEG decompression")
31 SET(ENABLE_JPEG_LOSSLESS ON CACHE BOOL "Enable JPEG-LS (Lossless) decompression") 31 SET(ENABLE_JPEG_LOSSLESS ON CACHE BOOL "Enable JPEG-LS (Lossless) decompression")
32 SET(ENABLE_PLUGINS ON CACHE BOOL "Enable plugins") 32 SET(ENABLE_PLUGINS ON CACHE BOOL "Enable plugins")
33 SET(BUILD_SERVE_FOLDERS ON CACHE BOOL "Build the ServeFolders plugin") 33 SET(BUILD_SERVE_FOLDERS ON CACHE BOOL "Build the ServeFolders plugin")
34 SET(BUILD_MODALITY_WORKLISTS ON CACHE BOOL "Build the sample plugin to serve modality worklists") 34 SET(BUILD_MODALITY_WORKLISTS ON CACHE BOOL "Build the sample plugin to serve modality worklists")
35 SET(USE_DCMTK_361 OFF CACHE BOOL "Use forthcoming DCMTK version 3.6.1 in static builds (instead of 3.6.0)")
35 36
36 # Advanced parameters to fine-tune linking against system libraries 37 # Advanced parameters to fine-tune linking against system libraries
37 SET(USE_SYSTEM_JSONCPP ON CACHE BOOL "Use the system version of JsonCpp") 38 SET(USE_SYSTEM_JSONCPP ON CACHE BOOL "Use the system version of JsonCpp")
38 SET(USE_SYSTEM_GOOGLE_LOG ON CACHE BOOL "Use the system version of Google Log") 39 SET(USE_SYSTEM_GOOGLE_LOG ON CACHE BOOL "Use the system version of Google Log")
39 SET(USE_SYSTEM_GOOGLE_TEST ON CACHE BOOL "Use the system version of Google Test") 40 SET(USE_SYSTEM_GOOGLE_TEST ON CACHE BOOL "Use the system version of Google Test")
247 UnitTestsSources/PluginsTests.cpp 248 UnitTestsSources/PluginsTests.cpp
248 ) 249 )
249 endif() 250 endif()
250 251
251 252
253 set(ORTHANC_ALL_SOURCES
254 ${ORTHANC_CORE_SOURCES}
255 ${ORTHANC_SERVER_SOURCES}
256 ${ORTHANC_UNIT_TESTS_SOURCES}
257 Plugins/Samples/ServeFolders/Plugin.cpp
258 Plugins/Samples/ModalityWorklists/Plugin.cpp
259 OrthancServer/main.cpp
260 )
261
262
263 if (CMAKE_COMPILER_IS_GNUCXX
264 AND NOT CMAKE_CROSSCOMPILING
265 AND NOT USE_DCMTK_361)
266 # Add the "-pedantic" flag only on the Orthanc sources, and only if
267 # using DCMTK 3.6.0
268 set_source_files_properties(${ORTHANC_ALL_SOURCES}
269 PROPERTIES COMPILE_FLAGS -pedantic
270 )
271 endif()
272
273
252 set(ORTHANC_EMBEDDED_FILES 274 set(ORTHANC_EMBEDDED_FILES
253 PREPARE_DATABASE ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/PrepareDatabase.sql 275 PREPARE_DATABASE ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/PrepareDatabase.sql
254 UPGRADE_DATABASE_3_TO_4 ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Upgrade3To4.sql 276 UPGRADE_DATABASE_3_TO_4 ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Upgrade3To4.sql
255 UPGRADE_DATABASE_4_TO_5 ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Upgrade4To5.sql 277 UPGRADE_DATABASE_4_TO_5 ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Upgrade4To5.sql
256 CONFIGURATION_SAMPLE ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Configuration.json 278 CONFIGURATION_SAMPLE ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Configuration.json