From c523de13b39a2bb128569ba5816af06e52d368d7 Mon Sep 17 00:00:00 2001 From: Patrick Storz Date: Sun, 31 Mar 2019 22:25:19 +0200 Subject: 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) --- CMakeScripts/DefineDependsandFlags.cmake | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'CMakeScripts/DefineDependsandFlags.cmake') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 09362da7d..8099f0997 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -10,14 +10,6 @@ list(APPEND INKSCAPE_INCS ${PROJECT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/include ) -# ---------------------------------------------------------------------------- -# 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") - # Errors for common mistakes list(APPEND INKSCAPE_CXX_FLAGS "-Werror=format") # e.g.: printf("%s", std::string("foo")) list(APPEND INKSCAPE_CXX_FLAGS "-Werror=format-security") # e.g.: printf(variable); @@ -29,6 +21,7 @@ if (CMAKE_COMPILER_IS_GNUCC) list(APPEND INKSCAPE_CXX_FLAGS_DEBUG "-fstack-clash-protection -fcf-protection") endif() endif() + # Define the flags for profiling if desired: if(WITH_PROFILING) set(BUILD_SHARED_LIBS off) -- cgit v1.2.3