From b388d54eb2f397c84152821dae6855e5e7867e9d Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Sat, 24 Nov 2018 09:30:34 +0100
Subject: [PATCH] advance to c++17
---
CMake/CMakeLists_bin.txt | 2 +-
CMake/CMakeLists_lib.txt | 4 ++--
CMake/CMakeLists_root.txt | 3 ---
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/CMake/CMakeLists_bin.txt b/CMake/CMakeLists_bin.txt
index ee9fac590f..2fd8987f52 100644
--- a/CMake/CMakeLists_bin.txt
+++ b/CMake/CMakeLists_bin.txt
@@ -22,7 +22,7 @@ target_include_directories(${{PROJECT_NAME}}
target_link_libraries(${{PROJECT_NAME}} {target_libs})
set_target_properties(${{PROJECT_NAME}} PROPERTIES
- CXX_STANDARD 14
+ CXX_STANDARD 17
CXX_STANDARD_REQUIRED ON
LINKER_LANGUAGE CXX
diff --git a/CMake/CMakeLists_lib.txt b/CMake/CMakeLists_lib.txt
index 4db78d92f1..4ed2fe5642 100644
--- a/CMake/CMakeLists_lib.txt
+++ b/CMake/CMakeLists_lib.txt
@@ -23,7 +23,7 @@ target_include_directories(${{PROJECT_NAME}}
)
set_target_properties(${{PROJECT_NAME}} PROPERTIES
- CXX_STANDARD 14
+ CXX_STANDARD 17
CXX_STANDARD_REQUIRED ON
LINKER_LANGUAGE CXX
@@ -62,7 +62,7 @@ set(SOURCE_FILES_TEST
add_executable(${{PROJECT_NAME_TEST}} ${{SOURCE_FILES_TEST}})
set_target_properties(${{PROJECT_NAME_TEST}} PROPERTIES
- CXX_STANDARD 14
+ CXX_STANDARD 17
CXX_STANDARD_REQUIRED ON
)
diff --git a/CMake/CMakeLists_root.txt b/CMake/CMakeLists_root.txt
index 7d2f5a6608..4b450dc246 100644
--- a/CMake/CMakeLists_root.txt
+++ b/CMake/CMakeLists_root.txt
@@ -73,9 +73,6 @@ elseif (CMAKE_BUILD_TYPE STREQUAL "Release")
endif ()
-# Cpp version
-set(CMAKE_CXX_STANDARD 17)
-
# TODO set CMAKE_INSTALL_PREFIX in release only
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set (CMAKE_INSTALL_PREFIX /usr)
--
GitLab