[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-581-g31004b5

[Kitware Robot]

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, next has been updated
       via  31004b59ed1dd444582ce5948ee151247ae3fb6c (commit)
       via  feed8d91328ee4c8416ba024a38edbab1669af3e (commit)
       via  ded7c14b87cd230f7f2a56b98e0575c46a4d54a8 (commit)
       via  3a4d0c3ec7ec9f86828335cfe7a5f3f4ac17698a (commit)
      from  606c1fcdf87b319fe10f2ad100508b16f23a4e59 (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=31004b59ed1dd444582ce5948ee151247ae3fb6c
commit 31004b59ed1dd444582ce5948ee151247ae3fb6c
Merge: 606c1fc feed8d9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 22 15:38:45 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Mar 22 11:38:48 2017 -0400

    Stage topic 'avoid-MSVC-per-version-vars'
    
    Topic-id: 23183
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/610


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=feed8d91328ee4c8416ba024a38edbab1669af3e
commit feed8d91328ee4c8416ba024a38edbab1669af3e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 22 11:36:26 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 22 11:36:26 2017 -0400

    FindRuby: Use `MSVC_VERSION` instead of `MSVC##`

diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
index b0e9b47..a9f8d35 100644
--- a/Modules/FindRuby.cmake
+++ b/Modules/FindRuby.cmake
@@ -207,19 +207,19 @@ set(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_
 
 if(WIN32)
    set( _RUBY_MSVC_RUNTIME "" )
-   if( MSVC60 )
+   if( MSVC_VERSION EQUAL 1200 )
      set( _RUBY_MSVC_RUNTIME "60" )
    endif()
-   if( MSVC70 )
+   if( MSVC_VERSION EQUAL 1300 )
      set( _RUBY_MSVC_RUNTIME "70" )
    endif()
-   if( MSVC71 )
+   if( MSVC_VERSION EQUAL 1310 )
      set( _RUBY_MSVC_RUNTIME "71" )
    endif()
-   if( MSVC80 )
+   if( MSVC_VERSION EQUAL 1400 )
      set( _RUBY_MSVC_RUNTIME "80" )
    endif()
-   if( MSVC90 )
+   if( MSVC_VERSION EQUAL 1500 )
      set( _RUBY_MSVC_RUNTIME "90" )
    endif()
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ded7c14b87cd230f7f2a56b98e0575c46a4d54a8
commit ded7c14b87cd230f7f2a56b98e0575c46a4d54a8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 22 11:36:11 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 22 11:36:11 2017 -0400

    FindGTK2: Use `MSVC_VERSION` instead of `MSVC##`

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 2eca5f9..b87b9f3 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -105,7 +105,7 @@
 #   * 14236: Detect gthread library
 #            Detect pangocairo on windows
 #            Detect pangocairo with gtk module instead of with gtkmm
-#   * 14259: Use vc100 libraries with MSVC11
+#   * 14259: Use vc100 libraries with VS 11
 #   * 14260: Export a GTK2_DEFINITIONS variable to set /vd2 when appropriate
 #            (i.e. MSVC)
 #   * Use the optimized/debug syntax for _LIBRARY and _LIBRARIES variables when
@@ -354,13 +354,13 @@ function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version)
 
     if(_expand_vc AND MSVC)
         # Add vc80/vc90/vc100 midfixes
-        if(MSVC80)
+        if(MSVC_VERSION EQUAL 1400)
             set(_library   ${_library}-vc80)
-        elseif(MSVC90)
+        elseif(MSVC_VERSION EQUAL 1500)
             set(_library   ${_library}-vc90)
-        elseif(MSVC10)
+        elseif(MSVC_VERSION EQUAL 1600)
             set(_library ${_library}-vc100)
-        elseif(MSVC11)
+        elseif(MSVC_VERSION EQUAL 1700)
             # Up to gtkmm-win 2.22.0-2 there are no vc110 libraries but vc100 can be used
             set(_library ${_library}-vc100)
         endif()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a4d0c3ec7ec9f86828335cfe7a5f3f4ac17698a
commit 3a4d0c3ec7ec9f86828335cfe7a5f3f4ac17698a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 22 11:35:29 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 22 11:35:29 2017 -0400

    FindBoost: Avoid mentioning discouraged `MSVC##`` variable

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 2886381..a6f63f5 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -445,7 +445,7 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret)
       set(_boost_COMPILER "-vc71")
     elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13) # Good luck!
       set(_boost_COMPILER "-vc7") # yes, this is correct
-    else() # MSVC60 Good luck!
+    else() # VS 6.0 Good luck!
       set(_boost_COMPILER "-vc6") # yes, this is correct
     endif()
   elseif (BORLAND)

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

Summary of changes:
 Modules/FindBoost.cmake |    2 +-
 Modules/FindGTK2.cmake  |   10 +++++-----
 Modules/FindRuby.cmake  |   10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake