kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Brad King 2016-09-08 10:21:35 -04:00
parent f506489d1e
commit 258b7b2833
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/GetPrerequisites.cmake
View File

@ -544,7 +544,7 @@ function(gp_resolved_file_type original_file file exepath dirs type_var)
string(TOLOWER "$ENV{windir}" windir) string(TOLOWER "$ENV{windir}" windir)
file(TO_CMAKE_PATH "${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) set(is_system 1)
endif() 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_windir}" windir)
string(TOLOWER "${env_sysdir}" sysroot) 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) set(is_system 1)
endif() endif()
endif() endif()