[Cmake-commits] CMake branch, master, updated. v3.14.1-596-g85b26a7

[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, master has been updated
       via  85b26a7254ce66404227f2b715fd4e29c64668f6 (commit)
       via  a15ed54dca5ebd2535a737b7200677c945c5c082 (commit)
       via  d48bf97fd3ec9c6cc818d32978122f019e35f638 (commit)
       via  14c7396fb940d04f2afd3e9a7230fa6d4fac8145 (commit)
      from  0dfb056cd3fa655ddf3cabb6b3ce0309b3037ca1 (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=85b26a7254ce66404227f2b715fd4e29c64668f6
commit 85b26a7254ce66404227f2b715fd4e29c64668f6
Merge: a15ed54 14c7396
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 4 15:33:19 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Apr 4 11:34:43 2019 -0400

    Merge topic 'FindGLEW-lib-suffixes'
    
    14c7396fb9 FindGLEW: fix CMAKE_FIND_LIBRARY_SUFFIXES
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !3179


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a15ed54dca5ebd2535a737b7200677c945c5c082
commit a15ed54dca5ebd2535a737b7200677c945c5c082
Merge: 0dfb056 d48bf97
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 4 15:32:46 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Apr 4 11:33:37 2019 -0400

    Merge topic 'FindBoost-clang-cl'
    
    d48bf97fd3 FindBoost: Consider boost suffixes suitable for clang-cl
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !3164


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d48bf97fd3ec9c6cc818d32978122f019e35f638
commit d48bf97fd3ec9c6cc818d32978122f019e35f638
Author:     Douman <douman at gmx.se>
AuthorDate: Fri Mar 29 22:45:47 2019 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 3 14:30:11 2019 -0400

    FindBoost: Consider boost suffixes suitable for clang-cl
    
    When compiling with `clang-cl` we can use either the MSVC- or
    Clang-built boost libraries.

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 6e7d3db..1231ff1 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -465,7 +465,7 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret)
     endif()
   elseif (GHSMULTI)
     set(_boost_COMPILER "-ghs")
-  elseif("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC")
+  elseif("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC" OR "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
     if(MSVC_TOOLSET_VERSION GREATER_EQUAL 141)
       set(_boost_COMPILER "-vc141;-vc140")
     elseif(MSVC_TOOLSET_VERSION GREATER_EQUAL 80)
@@ -477,6 +477,12 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret)
     else() # VS 6.0 Good luck!
       set(_boost_COMPILER "-vc6") # yes, this is correct
     endif()
+
+    if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xClang")
+      string(REPLACE "." ";" VERSION_LIST "${CMAKE_CXX_COMPILER_VERSION}")
+      list(GET VERSION_LIST 0 CLANG_VERSION_MAJOR)
+      set(_boost_COMPILER "-clangw${CLANG_VERSION_MAJOR};${_boost_COMPILER}")
+    endif()
   elseif (BORLAND)
     set(_boost_COMPILER "-bcb")
   elseif(CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=14c7396fb940d04f2afd3e9a7230fa6d4fac8145
commit 14c7396fb940d04f2afd3e9a7230fa6d4fac8145
Author:     Claudio Fantacci <claudio.fantacci at gmail.com>
AuthorDate: Tue Apr 2 09:43:34 2019 +0200
Commit:     Claudio Fantacci <claudio.fantacci at gmail.com>
CommitDate: Wed Apr 3 09:06:16 2019 +0200

    FindGLEW: fix CMAKE_FIND_LIBRARY_SUFFIXES
    
    FindGLEW temporarily changes the content of CMAKE_FIND_LIBRARY_SUFFIXES
    to look for static and dynamic GLEW library.
    However, it wasn't storing and restoring the initial content of such
    variable, causing possible issues in user project.

diff --git a/Modules/FindGLEW.cmake b/Modules/FindGLEW.cmake
index 34ee873..2e9a052 100644
--- a/Modules/FindGLEW.cmake
+++ b/Modules/FindGLEW.cmake
@@ -117,6 +117,8 @@ else()
 endif()
 
 
+set(__GLEW_CURRENT_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+
 __glew_set_find_library_suffix(SHARED)
 
 find_library(GLEW_SHARED_LIBRARY_RELEASE
@@ -142,6 +144,9 @@ find_library(GLEW_STATIC_LIBRARY_DEBUG
              PATH_SUFFIXES lib lib64
              PATHS ENV GLEW_ROOT)
 
+set(CMAKE_FIND_LIBRARY_SUFFIXES ${__GLEW_CURRENT_FIND_LIBRARY_SUFFIXES})
+unset(__GLEW_CURRENT_FIND_LIBRARY_SUFFIXES)
+
 include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
 
 select_library_configurations(GLEW_SHARED)

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

Summary of changes:
 Modules/FindBoost.cmake | 8 +++++++-
 Modules/FindGLEW.cmake  | 5 +++++
 2 files changed, 12 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake