summaryrefslogtreecommitdiffstats
path: root/Modules/Compiler
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2014-09-17 12:56:16 (GMT)
committerStephen Kelly <steveire@gmail.com>2014-09-17 12:56:16 (GMT)
commit0b80fc350ae71f0926b426762cb1f6efe17a5723 (patch)
tree46a340b1596ebdaf2caa115414d1fbbd0b40f2f9 /Modules/Compiler
parent56af8866038de20eb837d882aa9879c17e146ef7 (diff)
downloadCMake-0b80fc350ae71f0926b426762cb1f6efe17a5723.zip
CMake-0b80fc350ae71f0926b426762cb1f6efe17a5723.tar.gz
CMake-0b80fc350ae71f0926b426762cb1f6efe17a5723.tar.bz2
Clang: Don't overwrite c++11 compile option value with c++14 flag.
Diffstat (limited to 'Modules/Compiler')
-rw-r--r--Modules/Compiler/Clang-CXX.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index bdb6d69..7792999 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -24,8 +24,8 @@ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 2.1)
endif()
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
- set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++1y")
- set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
+ set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++1y")
+ set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
endif()
set(CMAKE_CXX_STANDARD_DEFAULT 98)