[Cmake-commits] CMake branch, next, updated. v3.7.1-2079-g5c6d51b

[Brad King]

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  5c6d51bdf072a8fb6e683636321e57430c0268ac (commit)
       via  e0ed1de4fb5e9d18c2d00775229496079d6e077a (commit)
      from  ee14e5aaa12451d93a0cc3787d2f73b2841ec950 (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=5c6d51bdf072a8fb6e683636321e57430c0268ac
commit 5c6d51bdf072a8fb6e683636321e57430c0268ac
Merge: ee14e5a e0ed1de
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 11:33:56 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 11:33:56 2017 -0500

    Merge topic 'InstallRequiredSystemLibraries-UCRT-configs' into next
    
    e0ed1de4 InstallRequiredSystemLibraries: Distinguish UCRT install configurations


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0ed1de4fb5e9d18c2d00775229496079d6e077a
commit e0ed1de4fb5e9d18c2d00775229496079d6e077a
Author:     Bjoern Thiel <bjoern.thiel at mpibpc.mpg.de>
AuthorDate: Wed Jan 11 04:49:22 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 11 11:20:47 2017 -0500

    InstallRequiredSystemLibraries: Distinguish UCRT install configurations
    
    Teach the `CMAKE_INSTALL_UCRT_LIBRARIES` feature to honor the
    `CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY` and `CMAKE_INSTALL_DEBUG_LIBRARIES`
    settings.
    
    Closes: #16542

diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake
index b0446c9..b04f044 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -204,21 +204,27 @@ if(MSVC)
     endif()
 
     if(CMAKE_INSTALL_UCRT_LIBRARIES AND NOT v VERSION_LESS 14)
-      # Find the Windows Universal CRT redistribution directory.
+      # Find the Windows Kits directory.
       get_filename_component(windows_kits_dir
         "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots;KitsRoot10]" ABSOLUTE)
       set(programfilesx86 "ProgramFiles(x86)")
-      find_path(WINDOWS_KITS_REDIST_DIR NAMES ucrt/DLLs/${CMAKE_MSVC_ARCH}/ucrtbase.dll
+      find_path(WINDOWS_KITS_DIR NAMES Redist/ucrt/DLLs/${CMAKE_MSVC_ARCH}/ucrtbase.dll
         PATHS
-        "${windows_kits_dir}/Redist"
-        "$ENV{ProgramFiles}/Windows Kits/10/Redist"
-        "$ENV{${programfilesx86}}/Windows Kits/10/Redist"
+        "${windows_kits_dir}"
+        "$ENV{ProgramFiles}/Windows Kits/10"
+        "$ENV{${programfilesx86}}/Windows Kits/10"
         )
-      mark_as_advanced(WINDOWS_KITS_REDIST_DIR)
+      mark_as_advanced(WINDOWS_KITS_DIR)
 
       # Glob the list of UCRT DLLs.
-      file(GLOB __ucrt_dlls "${WINDOWS_KITS_REDIST_DIR}/ucrt/DLLs/${CMAKE_MSVC_ARCH}/*.dll")
-      list(APPEND __install__libs ${__ucrt_dlls})
+      if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
+        file(GLOB __ucrt_dlls "${WINDOWS_KITS_DIR}/Redist/ucrt/DLLs/${CMAKE_MSVC_ARCH}/*.dll")
+        list(APPEND __install__libs ${__ucrt_dlls})
+      endif()
+      if(CMAKE_INSTALL_DEBUG_LIBRARIES)
+        file(GLOB __ucrt_dlls "${WINDOWS_KITS_DIR}/bin/${CMAKE_MSVC_ARCH}/ucrt/*.dll")
+        list(APPEND __install__libs ${__ucrt_dlls})
+      endif()
     endif()
   endmacro()
 

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

Summary of changes:
 Modules/InstallRequiredSystemLibraries.cmake |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake