Mercurial > hg > orthanc

comparison Resources/CMake/JsonCppConfiguration.cmake @ 3575:1d403ecf3391

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix for DCMTK if MinGW combined with C++11
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sun, 17 Nov 2019 17:58:14 +0100
parents 0c2a8d5e0097
children c575fb0adf91
comparison
equal deleted inserted replaced
3574:1fc578f9f01b 3575:1d403ecf3391
76 # Osimis has encountered problems when this macro is left at its 76 # Osimis has encountered problems when this macro is left at its
77 # default value (1000), so we increase this limit 77 # default value (1000), so we increase this limit
78 # https://gitlab.kitware.com/third-party/jsoncpp/commit/56df2068470241f9043b676bfae415ed62a0c172 78 # https://gitlab.kitware.com/third-party/jsoncpp/commit/56df2068470241f9043b676bfae415ed62a0c172
79 add_definitions(-DJSONCPP_DEPRECATED_STACK_LIMIT=5000) 79 add_definitions(-DJSONCPP_DEPRECATED_STACK_LIMIT=5000)
80 80
81 if (CMAKE_COMPILER_IS_GNUCXX OR 81 if (CMAKE_COMPILER_IS_GNUCXX)
82 "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") 82 message("Switching to C++11 standard in gcc, as version of JsonCpp is >= 1.0.0")
83 message("Switching to C++11 standard in gcc/clang, as version of JsonCpp is >= 1.0.0") 83 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -Wno-deprecated-declarations")
84 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
85 message("Switching to C++11 standard in clang, as version of JsonCpp is >= 1.0.0")
84 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-deprecated-declarations") 86 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-deprecated-declarations")
85 endif() 87 endif()
86 endif() 88 endif()