|
|
@@ -531,7 +531,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|api-ms-win-)[^/]+dll)")
|
|
|
+ if(lower MATCHES "^(${sysroot}/sys(tem|wow)|${windir}/sys(tem|wow)|(.*/)*(msvc|api-ms-win-|vcruntime)[^/]+dll)")
|
|
|
set(is_system 1)
|
|
|
endif()
|
|
|
|
|
|
@@ -559,7 +559,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|api-ms-win-)[^/]+dll)")
|
|
|
+ if(lower MATCHES "^(${sysroot}/sys(tem|wow)|${windir}/sys(tem|wow)|(.*/)*(msvc|api-ms-win-|vcruntime)[^/]+dll)")
|
|
|
set(is_system 1)
|
|
|
endif()
|
|
|
endif()
|
|
|
@@ -601,7 +601,7 @@ function(gp_resolved_file_type original_file file exepath dirs type_var)
|
|
|
|
|
|
if(NOT is_embedded)
|
|
|
if(NOT IS_ABSOLUTE "${resolved_file}")
|
|
|
- if(lower MATCHES "^(msvc|api-ms-win-)[^/]+dll" AND is_system)
|
|
|
+ if(lower MATCHES "^(msvc|api-ms-win-|vcruntime)[^/]+dll" AND is_system)
|
|
|
message(STATUS "info: non-absolute msvc file '${file}' returning type '${type}'")
|
|
|
else()
|
|
|
message(STATUS "warning: gp_resolved_file_type non-absolute file '${file}' returning type '${type}' -- possibly incorrect")
|