From 4eb85ec4eeb76637f595e857b05b667b4a40f8ad Mon Sep 17 00:00:00 2001 From: bvonhall Date: Mon, 27 Apr 2020 14:47:02 +0200 Subject: [PATCH 1/2] Set CPP standard to 17 --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7640010eb7..4d5142a554 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,6 +34,9 @@ if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY) ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) endif() +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED TRUE) + # ---- End Project ---- # The line above is necessary for the generation of doxygen by travis From 9ec1e68dd26fab6fc55b13336834c82abc5ef3b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barth=C3=A9l=C3=A9my=20von=20Haller?= Date: Wed, 29 Apr 2020 16:42:01 +0200 Subject: [PATCH 2/2] merge with existing cmake call --- CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d5142a554..cd9a9ee25f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,9 +34,6 @@ if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY) ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) endif() -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED TRUE) - # ---- End Project ---- # The line above is necessary for the generation of doxygen by travis @@ -72,6 +69,7 @@ unset(isSystemDir) # C++ standard if(NOT DEFINED CMAKE_CXX_STANDARD) set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED TRUE) endif() # Add compiler flags for warnings and (more importantly) fPIC and debug symbols