[Cmake-commits] CMake branch, next, updated. v3.4.2-2055-gc7234a8

[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  c7234a805cc4624901928f08d0507764d7290f18 (commit)
       via  c8daac3556bc4ef7b39e0e632ead55d566e927cc (commit)
      from  87636090c5e499a42c14e57a24b6c1daf7b64e2e (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=c7234a805cc4624901928f08d0507764d7290f18
commit c7234a805cc4624901928f08d0507764d7290f18
Merge: 8763609 c8daac3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 20 09:35:34 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 20 09:35:34 2016 -0500

    Merge topic 'GetPrerequisites-ms-ucrt' into next
    
    c8daac35 GetPrerequisites: Define api-ms-win-* files as system libraries (#15691)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8daac3556bc4ef7b39e0e632ead55d566e927cc
commit c8daac3556bc4ef7b39e0e632ead55d566e927cc
Author:     André Klitzing <aklitzing at gmail.com>
AuthorDate: Tue Jan 19 15:05:31 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 19 15:05:31 2016 -0500

    GetPrerequisites: Define api-ms-win-* files as system libraries (#15691)
    
    Suggested-by: Gilles Khouzam <gillesk at microsoft.com>

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index e4018b6..391e7f8 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -538,7 +538,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 "^(${sysroot}/sys(tem|wow)|${windir}/sys(tem|wow)|(.*/)*msvc[^/]+dll)")
+      if(lower MATCHES "^(api-ms-win-|${sysroot}/sys(tem|wow)|${windir}/sys(tem|wow)|(.*/)*msvc[^/]+dll)")
         set(is_system 1)
       endif()
 
@@ -566,7 +566,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 "^(${sysroot}/sys(tem|wow)|${windir}/sys(tem|wow)|(.*/)*msvc[^/]+dll)")
+          if(lower MATCHES "^(api-ms-win-|${sysroot}/sys(tem|wow)|${windir}/sys(tem|wow)|(.*/)*msvc[^/]+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