Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
d5e4cdc0
Commit
d5e4cdc0
authored
Sep 09, 2016
by
Brad King
Committed by
Kitware Robot
Sep 09, 2016
Browse files
Merge topic 'GetPrerequisites-absolute-ucrt'
258b7b28
GetPrerequisites: Recognize absolute paths to UCRT system libraries
parents
2572b824
258b7b28
Changes
1
Hide whitespace changes
Inline
Side-by-side
Modules/GetPrerequisites.cmake
View file @
d5e4cdc0
...
...
@@ -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
()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment