comparison CMakeLists.txt @ 77:f44ebb25691c

upgrade
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 25 Sep 2015 11:29:01 +0200
parents f869ea124433
children abdde1dfb3eb
comparison
equal deleted inserted replaced
76:07d2e87e450b 77:f44ebb25691c
30 # Advanced parameters to fine-tune linking against system libraries 30 # Advanced parameters to fine-tune linking against system libraries
31 set(USE_SYSTEM_BOOST ON CACHE BOOL "Use the system version of Boost") 31 set(USE_SYSTEM_BOOST ON CACHE BOOL "Use the system version of Boost")
32 set(USE_SYSTEM_GDCM ON CACHE BOOL "Use the system version of Grassroot DICOM (GDCM)") 32 set(USE_SYSTEM_GDCM ON CACHE BOOL "Use the system version of Grassroot DICOM (GDCM)")
33 set(USE_SYSTEM_GOOGLE_TEST ON CACHE BOOL "Use the system version of Google Test") 33 set(USE_SYSTEM_GOOGLE_TEST ON CACHE BOOL "Use the system version of Google Test")
34 set(USE_SYSTEM_JSONCPP ON CACHE BOOL "Use the system version of JsonCpp") 34 set(USE_SYSTEM_JSONCPP ON CACHE BOOL "Use the system version of JsonCpp")
35 set(USE_SYSTEM_LIBJPEG ON CACHE BOOL "Use the system version of libjpeg")
36 set(USE_SYSTEM_LIBPNG ON CACHE BOOL "Use the system version of libpng")
37 set(USE_SYSTEM_ZLIB ON CACHE BOOL "Use the system version of zlib") 35 set(USE_SYSTEM_ZLIB ON CACHE BOOL "Use the system version of zlib")
38 set(USE_SYSTEM_SQLITE ON CACHE BOOL "Use the system version of SQLite") 36 set(USE_SYSTEM_SQLITE ON CACHE BOOL "Use the system version of SQLite")
39 set(USE_SYSTEM_ORTHANC_SDK ON CACHE BOOL "Use the system version of the Orthanc plugin SDK") 37 set(USE_SYSTEM_ORTHANC_SDK ON CACHE BOOL "Use the system version of the Orthanc plugin SDK")
40 38
41 # Distribution-specific settings 39 # Distribution-specific settings
52 include(${CMAKE_SOURCE_DIR}/Orthanc/Resources/CMake/DownloadPackage.cmake) 50 include(${CMAKE_SOURCE_DIR}/Orthanc/Resources/CMake/DownloadPackage.cmake)
53 51
54 include(${CMAKE_SOURCE_DIR}/Orthanc/Resources/CMake/BoostConfiguration.cmake) 52 include(${CMAKE_SOURCE_DIR}/Orthanc/Resources/CMake/BoostConfiguration.cmake)
55 include(${CMAKE_SOURCE_DIR}/Orthanc/Resources/CMake/GoogleTestConfiguration.cmake) 53 include(${CMAKE_SOURCE_DIR}/Orthanc/Resources/CMake/GoogleTestConfiguration.cmake)
56 include(${CMAKE_SOURCE_DIR}/Orthanc/Resources/CMake/JsonCppConfiguration.cmake) 54 include(${CMAKE_SOURCE_DIR}/Orthanc/Resources/CMake/JsonCppConfiguration.cmake)
57 include(${CMAKE_SOURCE_DIR}/Orthanc/Resources/CMake/LibPngConfiguration.cmake)
58 include(${CMAKE_SOURCE_DIR}/Orthanc/Resources/CMake/ZlibConfiguration.cmake)
59 include(${CMAKE_SOURCE_DIR}/Orthanc/Resources/CMake/SQLiteConfiguration.cmake) 55 include(${CMAKE_SOURCE_DIR}/Orthanc/Resources/CMake/SQLiteConfiguration.cmake)
60 56
61 include(${CMAKE_SOURCE_DIR}/Resources/CMake/GdcmConfiguration.cmake) 57 include(${CMAKE_SOURCE_DIR}/Resources/CMake/GdcmConfiguration.cmake)
62 include(${CMAKE_SOURCE_DIR}/Resources/CMake/LibJpegConfiguration.cmake)
63 include(${CMAKE_SOURCE_DIR}/Resources/CMake/JavaScriptLibraries.cmake) 58 include(${CMAKE_SOURCE_DIR}/Resources/CMake/JavaScriptLibraries.cmake)
64 59
65 60
66 # Check that the Orthanc SDK headers are available or download them 61 # Check that the Orthanc SDK headers are available or download them
67 if (STATIC_BUILD OR NOT USE_SYSTEM_ORTHANC_SDK) 62 if (STATIC_BUILD OR NOT USE_SYSTEM_ORTHANC_SDK)