Mercurial > hg > orthanc

comparison Resources/CMake/JsonCppConfiguration.cmake @ 2429:fe90b3ec9d4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
2428:dedc24644cbe 2429:fe90b3ec9d4a
46 string(REGEX REPLACE 46 string(REGEX REPLACE
47 ".*JSONCPP_VERSION_MAJOR.*([0-9]+)$" "\\1" 47 ".*JSONCPP_VERSION_MAJOR.*([0-9]+)$" "\\1"
48 JSONCPP_VERSION_MAJOR ${JSONCPP_VERSION_MAJOR1}) 48 JSONCPP_VERSION_MAJOR ${JSONCPP_VERSION_MAJOR1})
49 message("JsonCpp major version: ${JSONCPP_VERSION_MAJOR}") 49 message("JsonCpp major version: ${JSONCPP_VERSION_MAJOR}")
50 50
51 if (CMAKE_COMPILER_IS_GNUCXX AND 51 if ((CMAKE_COMPILER_IS_GNUCXX OR
52 "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") AND
52 JSONCPP_VERSION_MAJOR GREATER 0) 53 JSONCPP_VERSION_MAJOR GREATER 0)
53 message("Switching to C++11 standard, as version of JsonCpp is >= 1.0.0") 54 message("Switching to C++11 standard in gcc/clang, as version of JsonCpp is >= 1.0.0")
54 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-deprecated-declarations") 55 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-deprecated-declarations")
55 endif() 56 endif()
56 else() 57 else()
57 message("Unable to detect the major version of JsonCpp, assuming < 1.0.0") 58 message("Unable to detect the major version of JsonCpp, assuming < 1.0.0")
58 endif() 59 endif()