Mercurial > hg > orthanc-webviewer
diff Orthanc/Resources/CMake/JsonCppConfiguration.cmake @ 175:dd1ad819ca33
sync
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 04 Jan 2018 07:34:54 +0100 |
| parents | 08f30c8962a7 |
| children | ab66a6baf2ae |
line wrap: on
line diff
--- a/Orthanc/Resources/CMake/JsonCppConfiguration.cmake Tue Jan 02 09:59:39 2018 +0100 +++ b/Orthanc/Resources/CMake/JsonCppConfiguration.cmake Thu Jan 04 07:34:54 2018 +0100 @@ -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()