diff options
| author | Brad King <brad.king@kitware.com> | 2016-01-21 18:55:41 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-01-21 18:55:41 (GMT) |
| commit | 184676532c8192a520b4db8380efbddc13272289 (patch) | |
| tree | b7d22c90d910c3319d371b619840717a7603f9ba /Modules | |
| parent | 750ae8d5a8890f5d8091105a0b03bee085cc4dff (diff) | |
| parent | c8daac3556bc4ef7b39e0e632ead55d566e927cc (diff) | |
| download | CMake-184676532c8192a520b4db8380efbddc13272289.zip CMake-184676532c8192a520b4db8380efbddc13272289.tar.gz CMake-184676532c8192a520b4db8380efbddc13272289.tar.bz2 | |
Merge topic 'GetPrerequisites-ms-ucrt'
c8daac35 GetPrerequisites: Define api-ms-win-* files as system libraries (#15691)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/GetPrerequisites.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
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() |