diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-06 17:25:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-09-06 17:25:48 (GMT) |
| commit | 05294a09162d4c503203863149a5a552b321817b (patch) | |
| tree | 92f9b0e11248f8a807f8c7c263c0ec0b665086dd | |
| parent | c6f9c6f67a472cae552cc313ccfb77e852bbda36 (diff) | |
| parent | 227e35359535710a124b6dbc481af1c3382bd4dd (diff) | |
| download | CMake-05294a09162d4c503203863149a5a552b321817b.zip CMake-05294a09162d4c503203863149a5a552b321817b.tar.gz CMake-05294a09162d4c503203863149a5a552b321817b.tar.bz2 | |
Merge topic 'msvc2015-cxx17'
227e3535 MSVC: Extend C++ language standard support to Visual Studio 2015 Update 3
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1227
| -rw-r--r-- | Modules/Compiler/MSVC-CXX.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/Compiler/MSVC-CXX.cmake b/Modules/Compiler/MSVC-CXX.cmake index f478b85..3a63e3f 100644 --- a/Modules/Compiler/MSVC-CXX.cmake +++ b/Modules/Compiler/MSVC-CXX.cmake @@ -3,7 +3,10 @@ include(Compiler/CMakeCommonCompilerMacros) -if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.10.25017) +if ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.0.24215.1 AND + CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10) OR + CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.10.25017) + # VS 2015 Update 3 and above support language standard level flags, # with the default and minimum level being C++14. set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "") |