diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-09 15:32:38 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-09 15:32:38 (GMT) |
| commit | d5e4cdc0f8c846cdf17f3276d77d352a7644bc88 (patch) | |
| tree | 2f3d0230ab249c5fff96f9d457c6ccc7407b2f0a | |
| parent | 2572b824d4b81de83a1b16dee84d8754e846522c (diff) | |
| parent | 258b7b283379a10e9fd527c2d863f1ddc7c5fa74 (diff) | |
| download | CMake-d5e4cdc0f8c846cdf17f3276d77d352a7644bc88.zip CMake-d5e4cdc0f8c846cdf17f3276d77d352a7644bc88.tar.gz CMake-d5e4cdc0f8c846cdf17f3276d77d352a7644bc88.tar.bz2 | |
Merge topic 'GetPrerequisites-absolute-ucrt'
258b7b28 GetPrerequisites: Recognize absolute paths to UCRT system libraries
| -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() |