diff options
| author | Patrick Storz <eduard.braun2@gmx.de> | 2019-03-31 20:25:19 +0000 |
|---|---|---|
| committer | Patrick Storz <eduard.braun2@gmx.de> | 2019-03-31 20:25:19 +0000 |
| commit | c523de13b39a2bb128569ba5816af06e52d368d7 (patch) | |
| tree | c9c675092c9875b4e9c88e19ffec706ed8ecf06a /CMakeLists.txt | |
| parent | CMake: Avoid defining _FORTIFY_SOURCE twice in separate places (diff) | |
| download | inkscape-c523de13b39a2bb128569ba5816af06e52d368d7.tar.gz inkscape-c523de13b39a2bb128569ba5816af06e52d368d7.zip | |
CMake: Use CMAKE_CXX_STANDARD and don't set it in three places
This requires bumping cmake version requirement to 3.1
(which should long be available on supported platforms, though)
TODO: We actually depend on GNU compiler extensions right now
(i.e. *don't* build with -std=c++11 but require -std=gnu++11)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0dcb68102..3050cdec1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -cmake_minimum_required(VERSION 2.8.8) +cmake_minimum_required(VERSION 3.1.0) cmake_policy(SET CMP0003 NEW) # don't be prolific with library paths cmake_policy(SET CMP0005 NEW) # proper define quoting @@ -18,9 +18,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) +# set(CMAKE_CXX_EXTENSIONS OFF) # enforces -std=c++11 instead of -std=gnu++11 + # TODO: build currently fails with it as we actually depend on GNU compiler extensions... list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeScripts/Modules") |