From 10e10dab71190a9bbfedc38c7e54a32c936f990e Mon Sep 17 00:00:00 2001 From: shahoian Date: Fri, 25 Dec 2020 19:09:55 +0100 Subject: [PATCH] Do not override explicitly -std=+ccXX option if set externally --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6fbd90c..dffa254 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,11 +12,13 @@ macro(add_target_property _target _prop _value) endmacro(add_target_property) if (CMAKE_VERSION VERSION_LESS "3.1") -if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT ${CMAKE_CXX_FLAGS} MATCHES "-std=") set (CMAKE_CXX_FLAGS "--std=gnu++11 ${CMAKE_CXX_FLAGS}") endif () else () - set (CMAKE_CXX_STANDARD 11) + if (NOT DEFINED CMAKE_CXX_STANDARD AND NOT ${CMAKE_CXX_FLAGS} MATCHES "-std=") + set (CMAKE_CXX_STANDARD 11) + endif() endif () list(APPEND CMAKE_PREFIX_PATH $ENV{ROOTSYS} ${ROOTSYS})