diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-20 10:17:24 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-20 10:17:49 (GMT) |
| commit | 3ab89b54754da171d1426d4bd6a15c0ddbaa0893 (patch) | |
| tree | 5d16160b6f664002545436467896bc3ca9ea056b /Modules | |
| parent | 119d1dadce8e2dfac80a9f27087355af3256c3e8 (diff) | |
| parent | 417b765f5a542f6ec9021983a071062d77840945 (diff) | |
| download | CMake-3ab89b54754da171d1426d4bd6a15c0ddbaa0893.zip CMake-3ab89b54754da171d1426d4bd6a15c0ddbaa0893.tar.gz CMake-3ab89b54754da171d1426d4bd6a15c0ddbaa0893.tar.bz2 | |
Merge topic 'GetPrerequisites-vcruntime-is-system' into release-3.17
417b765f5a GetPrerequisites: Classify vcruntime libraries as system
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4506
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/GetPrerequisites.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake index 57ae446..5c8c196 100644 --- a/Modules/GetPrerequisites.cmake +++ b/Modules/GetPrerequisites.cmake @@ -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") |