[Cmake-commits] CMake branch, master, updated. v3.9.1-743-g05294a0

Kitware Robot kwrobot at kitware.com
Wed Sep 6 13:35:03 EDT 2017


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  05294a09162d4c503203863149a5a552b321817b (commit)
       via  227e35359535710a124b6dbc481af1c3382bd4dd (commit)
      from  c6f9c6f67a472cae552cc313ccfb77e852bbda36 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05294a09162d4c503203863149a5a552b321817b
commit 05294a09162d4c503203863149a5a552b321817b
Merge: c6f9c6f 227e353
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 6 17:25:40 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Sep 6 13:25:48 2017 -0400

    Merge topic 'msvc2015-cxx17'
    
    227e3535 MSVC: Extend C++ language standard support to Visual Studio 2015 Update 3
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1227


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=227e35359535710a124b6dbc481af1c3382bd4dd
commit 227e35359535710a124b6dbc481af1c3382bd4dd
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Sep 1 23:33:12 2017 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri Sep 1 23:33:12 2017 +0200

    MSVC: Extend C++ language standard support to Visual Studio 2015 Update 3

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 "")

-----------------------------------------------------------------------

Summary of changes:
 Modules/Compiler/MSVC-CXX.cmake |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list