Description: Remove hardcoded c++11
Author: Mathieu Malaterre <malat@debian.org>
Bug-Debian: https://bugs.debian.org/1000222
Last-Update: 2021-11-22

--- orthanc-1.9.7+dfsg.orig/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake
+++ orthanc-1.9.7+dfsg/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake
@@ -517,11 +517,11 @@ if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "s
 
     if (JSONCPP_VERSION_MAJOR GREATER 0)
       message("Switching to C++11 standard, as version of JsonCpp is >= 1.0.0")
-      if (CMAKE_COMPILER_IS_GNUCXX)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-      elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-      endif()
+      #if (CMAKE_COMPILER_IS_GNUCXX)
+      #  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+      #elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+      #  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+      #endif()
     endif()
   else()
     message("Unable to detect the major version of JsonCpp, assuming < 1.0.0")
--- orthanc-1.9.7+dfsg.orig/OrthancFramework/Resources/CMake/JsonCppConfiguration.cmake
+++ orthanc-1.9.7+dfsg/OrthancFramework/Resources/CMake/JsonCppConfiguration.cmake
@@ -98,11 +98,11 @@ if (JSONCPP_CXX11)
   # https://gitlab.kitware.com/third-party/jsoncpp/commit/56df2068470241f9043b676bfae415ed62a0c172
   add_definitions(-DJSONCPP_DEPRECATED_STACK_LIMIT=5000)
 
-  if (CMAKE_COMPILER_IS_GNUCXX)
-    message("Switching to C++11 standard in gcc, as version of JsonCpp is >= 1.0.0")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    message("Switching to C++11 standard in clang, as version of JsonCpp is >= 1.0.0")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-  endif()
+  #if (CMAKE_COMPILER_IS_GNUCXX)
+  #  message("Switching to C++11 standard in gcc, as version of JsonCpp is >= 1.0.0")
+  #  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+  #elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+  #  message("Switching to C++11 standard in clang, as version of JsonCpp is >= 1.0.0")
+  #  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+  #endif()
 endif()
