diff options
| author | Simon Wells <simon@air.local> | 2018-10-08 17:26:25 +0000 |
|---|---|---|
| committer | Simon Wells <simon@air.local> | 2018-10-08 17:26:25 +0000 |
| commit | 9fd3f57e045b448682ad6da34420bd5eb22a7438 (patch) | |
| tree | 5e641e277d466acc86486cab323713bd5953f4b6 | |
| parent | SPAttributeEnum typed function arguments (diff) | |
| download | inkscape-9fd3f57e045b448682ad6da34420bd5eb22a7438.tar.gz inkscape-9fd3f57e045b448682ad6da34420bd5eb22a7438.zip | |
Add CMAKE_CXX_STANDARD for cmake 3.1
add note saying can remove -std=c++11 when minimum cmake is 3.1
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c692f40be..22cb6410a 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 897aafb57..53dd7fe94 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") |