[Cmake-commits] CMake branch, next, updated. v3.6.2-1894-g4ca4ed5

[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  4ca4ed50a47ff7136fed3337698b74e0ad91582f (commit)
       via  258b7b283379a10e9fd527c2d863f1ddc7c5fa74 (commit)
      from  2d65227983c95fe9e33efbdc507e9c9fbf605e0f (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=4ca4ed50a47ff7136fed3337698b74e0ad91582f
commit 4ca4ed50a47ff7136fed3337698b74e0ad91582f
Merge: 2d65227 258b7b2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 9 10:58:24 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 9 10:58:24 2016 -0400

    Merge topic 'GetPrerequisites-absolute-ucrt' into next
    
    258b7b28 GetPrerequisites: Recognize absolute paths to UCRT system libraries


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=258b7b283379a10e9fd527c2d863f1ddc7c5fa74
commit 258b7b283379a10e9fd527c2d863f1ddc7c5fa74
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 8 10:21:35 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 8 10:24:01 2016 -0400

    GetPrerequisites: Recognize absolute paths to UCRT system libraries
    
    The matching expression added by commit v3.5.0-rc1~33^2
    (GetPrerequisites: Define api-ms-win-* files as system libraries,
    2016-01-19) did not account for absolute paths to the UCRT libraries.
    We already recognize absolute paths to the MSVC runtime libraries.
    Do this for UCRT libraries too.
    
    Issue: #16240

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 58f5a92..127fda2 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -544,7 +544,7 @@ function(gp_resolved_file_type original_file file exepath dirs type_var)
       string(TOLOWER "$ENV{windir}" windir)
       file(TO_CMAKE_PATH "${windir}" windir)
 
-      if(lower MATCHES "^(api-ms-win-|${sysroot}/sys(tem|wow)|${windir}/sys(tem|wow)|(.*/)*msvc[^/]+dll)")
+      if(lower MATCHES "^(${sysroot}/sys(tem|wow)|${windir}/sys(tem|wow)|(.*/)*(msvc|api-ms-win-)[^/]+dll)")
         set(is_system 1)
       endif()
 
@@ -572,7 +572,7 @@ function(gp_resolved_file_type original_file file exepath dirs type_var)
           string(TOLOWER "${env_windir}" windir)
           string(TOLOWER "${env_sysdir}" sysroot)
 
-          if(lower MATCHES "^(api-ms-win-|${sysroot}/sys(tem|wow)|${windir}/sys(tem|wow)|(.*/)*msvc[^/]+dll)")
+          if(lower MATCHES "^(${sysroot}/sys(tem|wow)|${windir}/sys(tem|wow)|(.*/)*(msvc|api-ms-win-)[^/]+dll)")
             set(is_system 1)
           endif()
         endif()

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

Summary of changes:
 Modules/GetPrerequisites.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake