diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-08 14:21:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-09-08 14:24:01 (GMT) |
| commit | 258b7b283379a10e9fd527c2d863f1ddc7c5fa74 (patch) | |
| tree | 4a1a92caf299fea3d124df6ffb1598641f74708b /Modules | |
| parent | f506489d1ed222761f9ce752144a458290020e55 (diff) | |
| download | CMake-258b7b283379a10e9fd527c2d863f1ddc7c5fa74.zip CMake-258b7b283379a10e9fd527c2d863f1ddc7c5fa74.tar.gz CMake-258b7b283379a10e9fd527c2d863f1ddc7c5fa74.tar.bz2 | |
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
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 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() |