From fa2a28abc2484390a97c83af58646e4327673e96 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Tue, 17 Apr 2018 09:50:03 +0100 Subject: [PATCH] CMake: enable C++11 for jsoncpp --- cmake/jsoncpp.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/jsoncpp.cmake b/cmake/jsoncpp.cmake index 7a9d7e400..3d6b37edf 100644 --- a/cmake/jsoncpp.cmake +++ b/cmake/jsoncpp.cmake @@ -11,6 +11,10 @@ set(prefix "${CMAKE_BINARY_DIR}/deps") set(JSONCPP_LIBRARY "${prefix}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}jsoncpp${CMAKE_STATIC_LIBRARY_SUFFIX}") set(JSONCPP_INCLUDE_DIR "${prefix}/include") +if(NOT MSVC) + set(JSONCPP_EXTRA_FLAGS "-std=c++11") +endif() + set(byproducts "") if(CMAKE_VERSION VERSION_GREATER 3.1) set(byproducts BUILD_BYPRODUCTS "${JSONCPP_LIBRARY}") @@ -30,7 +34,7 @@ ExternalProject_Add(jsoncpp-project -DCMAKE_POSITION_INDEPENDENT_CODE=${BUILD_SHARED_LIBS} -DJSONCPP_WITH_TESTS=OFF -DJSONCPP_WITH_PKGCONFIG_SUPPORT=OFF - -DCMAKE_CXX_FLAGS=${JSONCCP_EXTRA_FLAGS} + -DCMAKE_CXX_FLAGS=${JSONCPP_EXTRA_FLAGS} # Overwrite build and install commands to force Release build on MSVC. BUILD_COMMAND cmake --build --config Release INSTALL_COMMAND cmake --build --config Release --target install