From 31052d65fba45f2b69c6fb75ac02bbd31453b2e4 Mon Sep 17 00:00:00 2001
From: Martin Killenberg <martin.killenberg@desy.de>
Date: Mon, 31 Aug 2020 17:16:33 +0200
Subject: [PATCH] Revert "Set CMAKE_CXX_STANDARD in enable_latest_cxx_support
only if cmake version supports it."
Automatically adding CMAKE_CXX_STANDARD to all projects is giving too much trouble because different CMAKE versions add different --std=gnu... flags which do not play well the the --std=c++... which we use.
This reverts commit ddb4d57586398f19b3107936d62fb1ccd26dd867.
---
cmake/enable_latest_cxx_support.cmake | 5 -----
1 file changed, 5 deletions(-)
diff --git a/cmake/enable_latest_cxx_support.cmake b/cmake/enable_latest_cxx_support.cmake
index 94a321b..21d0151 100644
--- a/cmake/enable_latest_cxx_support.cmake
+++ b/cmake/enable_latest_cxx_support.cmake
@@ -30,19 +30,14 @@ if(COMPILER_SUPPORTS_CXX17)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
set(${PROJECT_NAME}_CXX_FLAGS "${${PROJECT_NAME}_CXX_FLAGS} -std=c++17")
set(${PROJECT_NAME}_CMAKE_CXX_FLAGS "${${PROJECT_NAME}_CMAKE_CXX_FLAGS} -std=c++17")
- if(NOT ${CMAKE_VERSION} VERSION_LESS "3.8")
- set(CMAKE_CXX_STANDARD 17)
- endif()
elseif(COMPILER_SUPPORTS_CXX14)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
set(${PROJECT_NAME}_CXX_FLAGS "${${PROJECT_NAME}_CXX_FLAGS} -std=c++14")
set(${PROJECT_NAME}_CMAKE_CXX_FLAGS "${${PROJECT_NAME}_CMAKE_CXX_FLAGS} -std=c++14")
- set(CMAKE_CXX_STANDARD 14)
elseif(COMPILER_SUPPORTS_CXX11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(${PROJECT_NAME}_CXX_FLAGS "${${PROJECT_NAME}_CXX_FLAGS} -std=c++11")
set(${PROJECT_NAME}_CMAKE_CXX_FLAGS "${${PROJECT_NAME}_CMAKE_CXX_FLAGS} -std=c++11")
- set(CMAKE_CXX_STANDARD 11)
elseif(COMPILER_SUPPORTS_CXX0X)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
set(${PROJECT_NAME}_CXX_FLAGS "${${PROJECT_NAME}_CXX_FLAGS} -std=c++0x")
--
GitLab