diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-11-11 22:06:03 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-11-12 21:59:17 (GMT) |
| commit | 82c283f914c23df9e11cdc50f764bfa054540f54 (patch) | |
| tree | 9eae0465dfc3334922a12c7fce1fef5af98f919c /Modules/Compiler/Clang-CXX.cmake | |
| parent | b18155b7885705f794af5025173b2d1e45154d67 (diff) | |
| download | CMake-82c283f914c23df9e11cdc50f764bfa054540f54.zip CMake-82c283f914c23df9e11cdc50f764bfa054540f54.tar.gz CMake-82c283f914c23df9e11cdc50f764bfa054540f54.tar.bz2 | |
Features: Use the correct dialect flag when recording features.
Avoid using -std=c++1y for compilers which support -std=c++14, for
example.
Diffstat (limited to 'Modules/Compiler/Clang-CXX.cmake')
| -rw-r--r-- | Modules/Compiler/Clang-CXX.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake index 5dd7b4a..780a072 100644 --- a/Modules/Compiler/Clang-CXX.cmake +++ b/Modules/Compiler/Clang-CXX.cmake @@ -35,16 +35,16 @@ set(CMAKE_CXX_STANDARD_DEFAULT 98) macro(cmake_record_cxx_compile_features) macro(_get_clang_features std_version list) - record_compiler_features(CXX "-std=${std_version}" ${list}) + record_compiler_features(CXX "${std_version}" ${list}) endmacro() if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4) - _get_clang_features(c++1y CMAKE_CXX14_COMPILE_FEATURES) + _get_clang_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION} CMAKE_CXX14_COMPILE_FEATURES) if (_result EQUAL 0) - _get_clang_features(c++11 CMAKE_CXX11_COMPILE_FEATURES) + _get_clang_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION} CMAKE_CXX11_COMPILE_FEATURES) endif() if (_result EQUAL 0) - _get_clang_features(c++98 CMAKE_CXX98_COMPILE_FEATURES) + _get_clang_features(${CMAKE_CXX98_STANDARD_COMPILE_OPTION} CMAKE_CXX98_COMPILE_FEATURES) endif() else() set(_result 0) |