# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1583429665 -3600
# Node ID c575fb0adf913e2bbf0f9c0596b6ad6b2808353e
# Parent  faa695f433d5c9efbb1fa93e90a1d443b39e81aa
upgraded jsoncpp to 0.10.7 for pre-C++11 compilers

diff -r faa695f433d5 -r c575fb0adf91 NEWS
--- a/NEWS	Thu Mar 05 16:42:55 2020 +0100
+++ b/NEWS	Thu Mar 05 18:34:25 2020 +0100
@@ -49,6 +49,7 @@
 * Upgraded dependencies for static builds (notably on Windows):
   - dcmtk 3.6.5
   - openssl 1.1.1d
+  - jsoncpp 0.10.7 for pre-C++11 compilers
 
 
 Version 1.5.8 (2019-10-16)
diff -r faa695f433d5 -r c575fb0adf91 Resources/CMake/DcmtkConfigurationStatic-3.6.5.cmake
--- a/Resources/CMake/DcmtkConfigurationStatic-3.6.5.cmake	Thu Mar 05 16:42:55 2020 +0100
+++ b/Resources/CMake/DcmtkConfigurationStatic-3.6.5.cmake	Thu Mar 05 18:34:25 2020 +0100
@@ -183,3 +183,11 @@
 add_definitions(
   -DDISABLE_NAGLE_ALGORITHM=1
   )
+
+
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND
+    CMAKE_COMPILER_IS_GNUCXX)
+  add_definitions(
+    -DDCMTK_LOG4CPLUS_AVOID_WIN32_FLS
+    )
+endif()
diff -r faa695f433d5 -r c575fb0adf91 Resources/CMake/JsonCppConfiguration.cmake
--- a/Resources/CMake/JsonCppConfiguration.cmake	Thu Mar 05 16:42:55 2020 +0100
+++ b/Resources/CMake/JsonCppConfiguration.cmake	Thu Mar 05 18:34:25 2020 +0100
@@ -2,9 +2,9 @@
 
 if (STATIC_BUILD OR NOT USE_SYSTEM_JSONCPP)
   if (USE_LEGACY_JSONCPP)
-    set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-0.10.6)
-    set(JSONCPP_URL "http://orthanc.osimis.io/ThirdPartyDownloads/jsoncpp-0.10.6.tar.gz")
-    set(JSONCPP_MD5 "13d1991d79697df8cadbc25c93e37c83")
+    set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-0.10.7)
+    set(JSONCPP_URL "http://orthanc.osimis.io/ThirdPartyDownloads/jsoncpp-0.10.7.tar.gz")
+    set(JSONCPP_MD5 "3a8072ca6a1fa9cbaf7715ae625f134f")
     add_definitions(-DORTHANC_LEGACY_JSONCPP=1)
   else()
     set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-1.8.4)
diff -r faa695f433d5 -r c575fb0adf91 Resources/CMake/OpenSslConfigurationStatic-1.1.1.cmake
--- a/Resources/CMake/OpenSslConfigurationStatic-1.1.1.cmake	Thu Mar 05 16:42:55 2020 +0100
+++ b/Resources/CMake/OpenSslConfigurationStatic-1.1.1.cmake	Thu Mar 05 18:34:25 2020 +0100
@@ -21,6 +21,13 @@
   file(WRITE ${OPENSSL_SOURCES_DIR}/crypto/include/internal/bn_conf.h "")
   file(WRITE ${OPENSSL_SOURCES_DIR}/crypto/include/internal/dso_conf.h "")
 
+  # Enabling deprecated API is needed for civetweb
+  # file(WRITE ${OPENSSL_SOURCES_DIR}/include/openssl/opensslconf.h "
+  # #define DEPRECATEDIN_1_2_0(f) f;
+  # #define DEPRECATEDIN_1_1_0(f) f;
+  # #define DEPRECATEDIN_0_9_8(f) f;
+  # ")
+
   # Apply the patches
   execute_process(
     COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
@@ -66,6 +73,7 @@
   -DOPENSSL_NO_RIPEMD
 
   -DOPENSSLDIR="/usr/local/ssl"
+  -DOPENSSL_NO_ERR
   )
 
 
@@ -204,13 +212,16 @@
   ${OPENSSL_SOURCES_DIR}/crypto/sparcv9cap.c
   )
 
-# Check out "${OPENSSL_SOURCES_DIR}/Configurations/README": "this is
-# default if no option is specified, it works on any supported system"
-set(OPENSSL_DEFINITIONS "THIRTY_TWO_BIT")
+# Check out "${OPENSSL_SOURCES_DIR}/Configurations/README": "This is
+# default if no option is specified, it works on any supported
+# system." It is mandatory to define it as a macro, as it is used by
+# all the source files that include OpenSSL (e.g. "Core/Toolbox.cpp"
+# or curl)
+add_definitions(-DTHIRTY_TWO_BIT)
 
 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
   set(OPENSSL_DEFINITIONS
-    "${OPENSSL_DEFINITIONS};OPENSSL_SYSNAME_WIN32;SO_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN")
+    "${OPENSSL_DEFINITIONS};OPENSSL_SYSNAME_WIN32;SO_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;NO_WINDOWS_BRAINDEATH")
   
   if (ENABLE_OPENSSL_ENGINES)
     link_libraries(crypt32)
@@ -220,5 +231,5 @@
 set_source_files_properties(
   ${OPENSSL_SOURCES}
     PROPERTIES COMPILE_DEFINITIONS
-    "${OPENSSL_DEFINITIONS};DSO_NONE;NO_WINDOWS_BRAINDEATH"
+    "${OPENSSL_DEFINITIONS};DSO_NONE"
     )