Merge topic 'GetPrerequisites-ms-ucrt'
c8daac35 GetPrerequisites: Define api-ms-win-* files as system libraries (#15691)
This commit is contained in:
commit
184676532c
@ -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()
|
||||
|
Loading…
x
Reference in New Issue
Block a user