[Cmake-commits] CMake branch, master, updated. v3.12.1-573-gf782759

[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  f782759ed0997eb3d71e1187a829da62668ed5d2 (commit)
       via  036db90b9def3022091e4dd366dc42fc50d7b8ac (commit)
       via  488faed3ce62fc98395bbb6e38c99a63e90a5584 (commit)
       via  3dd926f4a8b0994f46b9dc877bc954fb3531bc5e (commit)
       via  bfe883af60cdf8f1c31a8b1d39a6f4f818578773 (commit)
       via  53bae4cc5e654266fa7f476d6e7e2b27217c8c38 (commit)
      from  e1ebec55d4b3e9db2c718064237707252ec4abf5 (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=f782759ed0997eb3d71e1187a829da62668ed5d2
commit f782759ed0997eb3d71e1187a829da62668ed5d2
Merge: 036db90 53bae4c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 6 14:00:11 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Sep 6 10:00:25 2018 -0400

    Merge topic 'CMakeFindBinUtils-fix-not-cached'
    
    53bae4cc5e CMakeFindBinUtils: Fix use with non-cached tool settings
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2355


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=036db90b9def3022091e4dd366dc42fc50d7b8ac
commit 036db90b9def3022091e4dd366dc42fc50d7b8ac
Merge: 488faed 3dd926f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 6 09:57:08 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 6 09:57:08 2018 -0400

    Merge branch 'release-3.12'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=488faed3ce62fc98395bbb6e38c99a63e90a5584
commit 488faed3ce62fc98395bbb6e38c99a63e90a5584
Merge: e1ebec5 bfe883a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 6 13:56:25 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Sep 6 09:56:36 2018 -0400

    Merge topic 'FindMatlab-no-CMAKE_CL_64'
    
    bfe883af60 FindMatlab: Remove erroneous duplicate code
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2354


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53bae4cc5e654266fa7f476d6e7e2b27217c8c38
commit 53bae4cc5e654266fa7f476d6e7e2b27217c8c38
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 5 14:57:15 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 5 15:03:02 2018 -0400

    CMakeFindBinUtils: Fix use with non-cached tool settings
    
    If a project or toolchain file hard-codes a tool location such as
    `CMAKE_LINKER` with a plain `set()` then the value will be stored
    in compiler information files but not cached.  If the value is
    not cached then we should not mark it as advanced because doing
    so will initialize an empty cache entry.
    
    Fixes: #18315

diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake
index 1b6823c..830639d 100644
--- a/Modules/CMakeFindBinUtils.cmake
+++ b/Modules/CMakeFindBinUtils.cmake
@@ -38,6 +38,8 @@ if(CMAKE_LINKER)
   endif()
 endif()
 
+set(_CMAKE_TOOL_VARS "")
+
 # if it's the MS C/CXX compiler, search for link
 if("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_SIMULATE_ID}" STREQUAL "xMSVC"
    OR "x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ID}" STREQUAL "xMSVC"
@@ -47,7 +49,7 @@ if("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_SIMULATE_ID}" STREQUAL "xMSVC"
 
   find_program(CMAKE_LINKER NAMES link HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
 
-  mark_as_advanced(CMAKE_LINKER)
+  list(APPEND _CMAKE_TOOL_VARS CMAKE_LINKER)
 
 # in all other cases search for ar, ranlib, etc.
 else()
@@ -70,7 +72,7 @@ else()
   find_program(CMAKE_OBJDUMP NAMES ${_CMAKE_TOOLCHAIN_PREFIX}objdump HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
   find_program(CMAKE_OBJCOPY NAMES ${_CMAKE_TOOLCHAIN_PREFIX}objcopy HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
 
-  mark_as_advanced(CMAKE_AR CMAKE_RANLIB CMAKE_STRIP CMAKE_LINKER CMAKE_NM CMAKE_OBJDUMP CMAKE_OBJCOPY)
+  list(APPEND _CMAKE_TOOL_VARS CMAKE_AR CMAKE_RANLIB CMAKE_STRIP CMAKE_LINKER CMAKE_NM CMAKE_OBJDUMP CMAKE_OBJCOPY)
 
 endif()
 
@@ -81,5 +83,15 @@ if(CMAKE_PLATFORM_HAS_INSTALLNAME)
     message(FATAL_ERROR "Could not find install_name_tool, please check your installation.")
   endif()
 
-  mark_as_advanced(CMAKE_INSTALL_NAME_TOOL)
+  list(APPEND _CMAKE_TOOL_VARS CMAKE_INSTALL_NAME_TOOL)
 endif()
+
+# Mark any tool cache entries as advanced.
+foreach(var IN LISTS _CMAKE_TOOL_VARS)
+  get_property(_CMAKE_TOOL_CACHED CACHE ${var} PROPERTY TYPE)
+  if(_CMAKE_TOOL_CACHED)
+    mark_as_advanced(${var})
+  endif()
+endforeach()
+unset(_CMAKE_TOOL_VARS)
+unset(_CMAKE_TOOL_CACHED)

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

Summary of changes:
 Modules/CMakeFindBinUtils.cmake | 18 +++++++++++++++---
 Modules/FindMatlab.cmake        | 15 ---------------
 2 files changed, 15 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
CMake