Mercurial > hg > orthanc
diff Resources/CMake/JsonCppConfiguration.cmake @ 2429:fe90b3ec9d4a
improvement in Orthanc framework config
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 27 Oct 2017 13:04:41 +0200 |
| parents | 74d0953a3681 |
| children | 0611aa383e62 |
line wrap: on
line diff
--- a/Resources/CMake/JsonCppConfiguration.cmake Tue Oct 10 13:23:16 2017 +0200 +++ b/Resources/CMake/JsonCppConfiguration.cmake Fri Oct 27 13:04:41 2017 +0200 @@ -48,9 +48,10 @@ JSONCPP_VERSION_MAJOR ${JSONCPP_VERSION_MAJOR1}) message("JsonCpp major version: ${JSONCPP_VERSION_MAJOR}") - if (CMAKE_COMPILER_IS_GNUCXX AND + if ((CMAKE_COMPILER_IS_GNUCXX OR + "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") AND JSONCPP_VERSION_MAJOR GREATER 0) - message("Switching to C++11 standard, as version of JsonCpp is >= 1.0.0") + message("Switching to C++11 standard in gcc/clang, as version of JsonCpp is >= 1.0.0") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-deprecated-declarations") endif() else()