summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2014-09-17 12:57:07 (GMT)
committerStephen Kelly <steveire@gmail.com>2014-09-17 12:57:07 (GMT)
commit49b8140e5db355229dd2984967e8a08713c9ea9b (patch)
treea568cc5886e26741833ebb7d7c8af080d6b0382e
parent0b80fc350ae71f0926b426762cb1f6efe17a5723 (diff)
downloadCMake-49b8140e5db355229dd2984967e8a08713c9ea9b.zip
CMake-49b8140e5db355229dd2984967e8a08713c9ea9b.tar.gz
CMake-49b8140e5db355229dd2984967e8a08713c9ea9b.tar.bz2
Clang: Enable c++14 dialect flag with Clang 3.5.
-rw-r--r--Modules/Compiler/Clang-CXX.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index 7792999..5dd7b4a 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -23,7 +23,10 @@ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 2.1)
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++0x")
endif()
-if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
+if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)
+ set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++14")
+ set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++14")
+elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++1y")
set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
endif()