comparison CMakeLists.txt @ 41:1a96ab7b6877

trying to upgrade openssl to 1.1.1 in static builds
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 17 Dec 2020 10:02:04 +0100
parents 16cf7c2eb806
children 5f50a2b2ae04
comparison
equal deleted inserted replaced
40:16cf7c2eb806 41:1a96ab7b6877
1
2 # C++11 is necessary to build the Google Cloud Platform C++ Client
3 # Libraries (this plugin cannot be compiled on Visual Studio 2008, or
4 # using Linux Standard Base - HolyBuildBox is used on Linux). MinGW on
5 # Ubuntu 18.04 does not work either, as "std::mutex" seems to be
6 # undefined. https://github.com/googleapis/google-cloud-cpp
7
8
1 cmake_minimum_required(VERSION 2.8) 9 cmake_minimum_required(VERSION 2.8)
2 10
3 project(GoogleCloudPlatform) 11 project(GoogleCloudPlatform)
4 12
5 set(GCP_PLUGIN_VERSION "mainline") 13 set(GCP_PLUGIN_VERSION "mainline")
6 14
7 if (GCP_PLUGIN_VERSION STREQUAL "mainline") 15 if (GCP_PLUGIN_VERSION STREQUAL "mainline")
8 set(ORTHANC_FRAMEWORK_VERSION "mainline") 16 set(ORTHANC_FRAMEWORK_VERSION "mainline")
9 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") 17 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
10 else() 18 else()
11 set(ORTHANC_FRAMEWORK_VERSION "1.5.7") 19 set(ORTHANC_FRAMEWORK_VERSION "4a3ba4bf4ba7") # This is Orthanc Framework pre-1.8.2 (includes a fix for OpenSSL on MSVC)
12 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") 20 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
13 endif() 21 endif()
14 22
15 23
16 # Parameters of the build 24 # Parameters of the build
24 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)")
25 set(USE_SYSTEM_ORTHANC_SDK ON CACHE BOOL "Use the system version of the Orthanc plugin SDK") 33 set(USE_SYSTEM_ORTHANC_SDK ON CACHE BOOL "Use the system version of the Orthanc plugin SDK")
26 set(ORTHANC_SDK_VERSION "1.0.0" CACHE STRING "Version of the Orthanc plugin SDK to use, if not using the system version (can be \"1.0.0\")") 34 set(ORTHANC_SDK_VERSION "1.0.0" CACHE STRING "Version of the Orthanc plugin SDK to use, if not using the system version (can be \"1.0.0\")")
27 35
28 36
29
30 # Download and setup the Orthanc framework 37 # Download and setup the Orthanc framework
31 include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake) 38 include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake)
32 39
33 include_directories(${ORTHANC_FRAMEWORK_ROOT}) 40 include_directories(${ORTHANC_FRAMEWORK_ROOT})
34 41
40 47
41 include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/CMake/LibCurlConfiguration.cmake) 48 include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/CMake/LibCurlConfiguration.cmake)
42 include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/CMake/OpenSslConfiguration.cmake) 49 include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/CMake/OpenSslConfiguration.cmake)
43 50
44 else() 51 else()
45 set(OPENSSL_STATIC_VERSION "1.0.2" CACHE STRING "TODO - Upgrade to OpenSSL 1.1.1" FORCE) 52 set(OPENSSL_STATIC_VERSION "1.1.1" CACHE STRING "Force the use of OpenSSL 1.1.1" FORCE)
46 53
47 include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkParameters.cmake) 54 include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkParameters.cmake)
48 55
49 set(ENABLE_CRYPTO_OPTIONS ON) 56 set(ENABLE_CRYPTO_OPTIONS ON)
50 set(ENABLE_ZLIB ON) 57 set(ENABLE_ZLIB ON)
51 set(ENABLE_WEB_CLIENT ON) 58 set(ENABLE_WEB_CLIENT ON)