From a8ba1fb71d55b7a3afcd71876ad726b779dd0ff9 Mon Sep 17 00:00:00 2001
From: Mark de Wever <koraq@xs4all.nl>
Date: Mon, 4 Apr 2022 13:44:06 +0200
Subject: [PATCH] AST-850 Use C++17
---
.clang-format | 2 +-
CMakeLists.txt | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/.clang-format b/.clang-format
index 67255e6d..ea5fa625 100644
--- a/.clang-format
+++ b/.clang-format
@@ -147,7 +147,7 @@ SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
-Standard: c++11
+Standard: c++17
StatementMacros:
- Q_UNUSED
- QT_REQUIRE_VERSION
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f81f6dc..53abdd8c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@
#------------------------------------------------------------------------------
# Top level CMakeLists.txt file for EveryBeam
-cmake_minimum_required(VERSION 3.7)
+cmake_minimum_required(VERSION 3.8)
#------------------------------------------------------------------------------
# Set version name and project number
@@ -118,7 +118,10 @@ if(POLICY CMP0074)
endif()
# Set compile options
-add_compile_options(-std=c++11 "${OpenMP_CXX_FLAGS}" -Wall)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED YES)
+set(CMAKE_CXX_EXTENSIONS NO)
+add_compile_options("${OpenMP_CXX_FLAGS}" -Wall)
string(APPEND CMAKE_SHARED_LINKER_FLAGS " -Wl,--no-undefined")
if(NOT CMAKE_BUILD_TYPE MATCHES Debug)
--
GitLab