comparison CMakeLists.txt @ 2014:e39a2657f1c6

Dropped support of Google Log
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 13 Jun 2016 13:39:10 +0200
parents 01de36d949c3
children a0bd8cd55da7
comparison
equal deleted inserted replaced
2013:f6e68c0c2737 2014:e39a2657f1c6
24 SET(STANDALONE_BUILD ON CACHE BOOL "Standalone build (all the resources are embedded, necessary for releases)") 24 SET(STANDALONE_BUILD ON CACHE BOOL "Standalone build (all the resources are embedded, necessary for releases)")
25 SET(ENABLE_SSL ON CACHE BOOL "Include support for SSL") 25 SET(ENABLE_SSL ON CACHE BOOL "Include support for SSL")
26 SET(DCMTK_DICTIONARY_DIR "" CACHE PATH "Directory containing the DCMTK dictionaries \"dicom.dic\" and \"private.dic\" (only when using system version of DCMTK)") 26 SET(DCMTK_DICTIONARY_DIR "" CACHE PATH "Directory containing the DCMTK dictionaries \"dicom.dic\" and \"private.dic\" (only when using system version of DCMTK)")
27 SET(ALLOW_DOWNLOADS OFF CACHE BOOL "Allow CMake to download packages") 27 SET(ALLOW_DOWNLOADS OFF CACHE BOOL "Allow CMake to download packages")
28 SET(UNIT_TESTS_WITH_HTTP_CONNEXIONS ON CACHE BOOL "Allow unit tests to make HTTP requests") 28 SET(UNIT_TESTS_WITH_HTTP_CONNEXIONS ON CACHE BOOL "Allow unit tests to make HTTP requests")
29 SET(ENABLE_GOOGLE_LOG OFF CACHE BOOL "Enable Google Log (otherwise, an internal logger is used)")
30 SET(ENABLE_JPEG ON CACHE BOOL "Enable JPEG decompression") 29 SET(ENABLE_JPEG ON CACHE BOOL "Enable JPEG decompression")
31 SET(ENABLE_JPEG_LOSSLESS ON CACHE BOOL "Enable JPEG-LS (Lossless) decompression") 30 SET(ENABLE_JPEG_LOSSLESS ON CACHE BOOL "Enable JPEG-LS (Lossless) decompression")
32 SET(ENABLE_PLUGINS ON CACHE BOOL "Enable plugins") 31 SET(ENABLE_PLUGINS ON CACHE BOOL "Enable plugins")
33 SET(BUILD_SERVE_FOLDERS ON CACHE BOOL "Build the ServeFolders plugin") 32 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") 33 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)") 34 SET(USE_DCMTK_361 OFF CACHE BOOL "Use forthcoming DCMTK version 3.6.1 in static builds (instead of 3.6.0)")
36 35
37 # Advanced parameters to fine-tune linking against system libraries 36 # Advanced parameters to fine-tune linking against system libraries
38 SET(USE_SYSTEM_JSONCPP ON CACHE BOOL "Use the system version of JsonCpp") 37 SET(USE_SYSTEM_JSONCPP ON CACHE BOOL "Use the system version of JsonCpp")
39 SET(USE_SYSTEM_GOOGLE_LOG ON CACHE BOOL "Use the system version of Google Log")
40 SET(USE_SYSTEM_GOOGLE_TEST ON CACHE BOOL "Use the system version of Google Test") 38 SET(USE_SYSTEM_GOOGLE_TEST ON CACHE BOOL "Use the system version of Google Test")
41 SET(USE_SYSTEM_SQLITE ON CACHE BOOL "Use the system version of SQLite") 39 SET(USE_SYSTEM_SQLITE ON CACHE BOOL "Use the system version of SQLite")
42 SET(USE_SYSTEM_MONGOOSE ON CACHE BOOL "Use the system version of Mongoose") 40 SET(USE_SYSTEM_MONGOOSE ON CACHE BOOL "Use the system version of Mongoose")
43 SET(USE_SYSTEM_LUA ON CACHE BOOL "Use the system version of Lua") 41 SET(USE_SYSTEM_LUA ON CACHE BOOL "Use the system version of Lua")
44 SET(USE_SYSTEM_DCMTK ON CACHE BOOL "Use the system version of DCMTK") 42 SET(USE_SYSTEM_DCMTK ON CACHE BOOL "Use the system version of DCMTK")
285 283
286 ##################################################################### 284 #####################################################################
287 ## Inclusion of third-party dependencies 285 ## Inclusion of third-party dependencies
288 ##################################################################### 286 #####################################################################
289 287
290 if (ENABLE_GOOGLE_LOG)
291 include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleLogConfiguration.cmake)
292 endif()
293
294 include(${CMAKE_SOURCE_DIR}/Resources/CMake/JsonCppConfiguration.cmake) 288 include(${CMAKE_SOURCE_DIR}/Resources/CMake/JsonCppConfiguration.cmake)
295 include(${CMAKE_SOURCE_DIR}/Resources/CMake/LibCurlConfiguration.cmake) 289 include(${CMAKE_SOURCE_DIR}/Resources/CMake/LibCurlConfiguration.cmake)
296 include(${CMAKE_SOURCE_DIR}/Resources/CMake/LibPngConfiguration.cmake) 290 include(${CMAKE_SOURCE_DIR}/Resources/CMake/LibPngConfiguration.cmake)
297 include(${CMAKE_SOURCE_DIR}/Resources/CMake/LibJpegConfiguration.cmake) 291 include(${CMAKE_SOURCE_DIR}/Resources/CMake/LibJpegConfiguration.cmake)
298 include(${CMAKE_SOURCE_DIR}/Resources/CMake/LuaConfiguration.cmake) 292 include(${CMAKE_SOURCE_DIR}/Resources/CMake/LuaConfiguration.cmake)
414 ${ORTHANC_CORE_SOURCES} 408 ${ORTHANC_CORE_SOURCES}
415 ${AUTOGENERATED_SOURCES} 409 ${AUTOGENERATED_SOURCES}
416 410
417 ${BOOST_SOURCES} 411 ${BOOST_SOURCES}
418 ${CURL_SOURCES} 412 ${CURL_SOURCES}
419 ${GOOGLE_LOG_SOURCES}
420 ${JSONCPP_SOURCES} 413 ${JSONCPP_SOURCES}
421 ${LIBPNG_SOURCES} 414 ${LIBPNG_SOURCES}
422 ${LIBJPEG_SOURCES} 415 ${LIBJPEG_SOURCES}
423 ${LUA_SOURCES} 416 ${LUA_SOURCES}
424 ${MONGOOSE_SOURCES} 417 ${MONGOOSE_SOURCES}