# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1608195724 -3600
# Node ID 1a96ab7b6877138d04589161ef143ccd51bab57f
# Parent  16cf7c2eb806716154e3bd7f262450ed5505b061
trying to upgrade openssl to 1.1.1 in static builds

diff -r 16cf7c2eb806 -r 1a96ab7b6877 CMakeLists.txt
--- a/CMakeLists.txt	Fri Nov 06 18:12:00 2020 +0100
+++ b/CMakeLists.txt	Thu Dec 17 10:02:04 2020 +0100
@@ -1,3 +1,11 @@
+
+# C++11 is necessary to build the Google Cloud Platform C++ Client
+# Libraries (this plugin cannot be compiled on Visual Studio 2008, or
+# using Linux Standard Base - HolyBuildBox is used on Linux). MinGW on
+# Ubuntu 18.04 does not work either, as "std::mutex" seems to be
+# undefined. https://github.com/googleapis/google-cloud-cpp
+
+
 cmake_minimum_required(VERSION 2.8)
 
 project(GoogleCloudPlatform)
@@ -8,7 +16,7 @@
   set(ORTHANC_FRAMEWORK_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_VERSION "1.5.7")
+  set(ORTHANC_FRAMEWORK_VERSION "4a3ba4bf4ba7")  # This is Orthanc Framework pre-1.8.2 (includes a fix for OpenSSL on MSVC)
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
@@ -26,7 +34,6 @@
 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\")")
 
 
-
 # Download and setup the Orthanc framework
 include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake)
 
@@ -42,8 +49,8 @@
   include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/CMake/OpenSslConfiguration.cmake)
 
 else()
-  set(OPENSSL_STATIC_VERSION "1.0.2" CACHE STRING "TODO - Upgrade to OpenSSL 1.1.1" FORCE)
-
+  set(OPENSSL_STATIC_VERSION "1.1.1" CACHE STRING "Force the use of OpenSSL 1.1.1" FORCE)
+  
   include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkParameters.cmake)
 
   set(ENABLE_CRYPTO_OPTIONS ON)
diff -r 16cf7c2eb806 -r 1a96ab7b6877 NEWS
--- a/NEWS	Fri Nov 06 18:12:00 2020 +0100
+++ b/NEWS	Thu Dec 17 10:02:04 2020 +0100
@@ -2,6 +2,8 @@
 ===============================
 
 * Support of dynamic linking against the system-wide Orthanc framework library
+* Upgraded dependencies for static builds (notably on Windows and LSB):
+  - openssl 1.1.1g
 
 
 Version 1.0 (2019-06-26)