From 1d62372b369a41188cb11baf0fdad4b8eb51da09 Mon Sep 17 00:00:00 2001 From: Rechi Date: Thu, 23 May 2019 09:57:59 +0200 Subject: [cmake] use CMAKE_CXX_STANDARD to set WindowsStore specific C++ standard --- cmake/scripts/common/CompilerSettings.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cmake/scripts/common/CompilerSettings.cmake') diff --git a/cmake/scripts/common/CompilerSettings.cmake b/cmake/scripts/common/CompilerSettings.cmake index 48cc69bd65..136ebd2b29 100644 --- a/cmake/scripts/common/CompilerSettings.cmake +++ b/cmake/scripts/common/CompilerSettings.cmake @@ -1,6 +1,7 @@ # Languages and global compiler settings -set(CMAKE_CXX_STANDARD 11) +if(NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS 11) + set(CMAKE_CXX_STANDARD 11) +endif() set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -x assembler-with-cpp") - -- cgit v1.2.3