diff options
author | Brad King <brad.king@kitware.com> | 2017-06-26 14:34:02 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2017-06-26 14:34:02 (GMT) |
commit | c24e66561356af461245a59dda8f5161399d48a6 (patch) | |
tree | 2ecffd25a6e35e604e9f3d03b7d42cd89319e0de /Modules | |
parent | 319bd92589bdd884fd507a525cb131cb7b0aaab5 (diff) | |
parent | 23451a66acc9762f27ab93cb4fe2192b2fb3fbfc (diff) | |
download | CMake-c24e66561356af461245a59dda8f5161399d48a6.zip CMake-c24e66561356af461245a59dda8f5161399d48a6.tar.gz CMake-c24e66561356af461245a59dda8f5161399d48a6.tar.bz2 |
Merge branch 'GetPrerequisites-ucrt-no-warn' into release-3.9
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/GetPrerequisites.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake index 0090cdc..4e52cb3 100644 --- a/Modules/GetPrerequisites.cmake +++ b/Modules/GetPrerequisites.cmake @@ -609,7 +609,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[^/]+dll" AND is_system) + if(lower MATCHES "^(msvc|api-ms-win-)[^/]+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") |