kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'GetPrerequisites-absolute-ucrt' 

258b7b28 GetPrerequisites: Recognize absolute paths to UCRT system libraries
This commit is contained in:
Brad King 2016-09-09 11:32:38 -04:00 committed by CMake Topic Stage
parent 2572b824d4 258b7b2833
commit d5e4cdc0f8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/GetPrerequisites.cmake
View File

@ -544,7 +544,7 @@ function(gp_resolved_file_type original_file file exepath dirs type_var)
string(TOLOWER "$ENV{windir}" windir) string(TOLOWER "$ENV{windir}" windir)
file(TO_CMAKE_PATH "${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) set(is_system 1)
endif() 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_windir}" windir)
string(TOLOWER "${env_sysdir}" sysroot) 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) set(is_system 1)
endif() endif()
endif() endif()