From 9fd3f57e045b448682ad6da34420bd5eb22a7438 Mon Sep 17 00:00:00 2001 From: Simon Wells Date: Tue, 9 Oct 2018 06:26:25 +1300 Subject: [PATCH] Add CMAKE_CXX_STANDARD for cmake 3.1 add note saying can remove -std=c++11 when minimum cmake is 3.1 --- CMakeLists.txt | 4 ++++ CMakeScripts/DefineDependsandFlags.cmake | 2 ++ 2 files changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c692f40bea..22cb6410af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,6 +13,10 @@ message("Binary Dir: ${CMAKE_CURRENT_BINARY_DIR}") # ----------------------------------------------------------------------------- # CMake Configuration # ----------------------------------------------------------------------------- +# Used in cmake 3.1+ +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeScripts/Modules") # avoid having empty buildtype diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 897aafb579..53dd7fe947 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -14,6 +14,8 @@ list(APPEND INKSCAPE_INCS ${PROJECT_SOURCE_DIR} # Add C++11 standard compliance # TODO: Add a proper check for compiler compliance here # ---------------------------------------------------------------------------- +# this can be removed when cmake minimum is 3.1 +# as replaced with CMAKE_CXX_STANDARD in main CMakeLists.txt list(APPEND INKSCAPE_CXX_FLAGS "-std=c++11") -- GitLab