Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Dennis Klein
CMake
Commits
d48f69d0
Commit
d48f69d0
authored
Oct 08, 2016
by
Stephen Kelly
Browse files
cmLocalGenerator: Move flag determination up in the function
This content is independent of any targets.
parent
ff8e321c
Changes
1
Show whitespace changes
Inline
Side-by-side
Source/cmLocalGenerator.cxx
View file @
d48f69d0
...
...
@@ -1419,6 +1419,15 @@ void cmLocalGenerator::OutputLinkLibraries(
std
::
string
libPathTerminator
=
this
->
Makefile
->
GetSafeDefinition
(
"CMAKE_LIBRARY_PATH_TERMINATOR"
);
// Add standard libraries for this language.
std
::
string
standardLibsVar
=
"CMAKE_"
;
standardLibsVar
+=
cli
.
GetLinkLanguage
();
standardLibsVar
+=
"_STANDARD_LIBRARIES"
;
std
::
string
stdLibString
;
if
(
const
char
*
stdLibs
=
this
->
Makefile
->
GetDefinition
(
standardLibsVar
))
{
stdLibString
=
stdLibs
;
}
// Append the framework search path flags.
std
::
string
fwSearchFlagVar
=
"CMAKE_"
;
fwSearchFlagVar
+=
linkLanguage
;
...
...
@@ -1502,14 +1511,6 @@ void cmLocalGenerator::OutputLinkLibraries(
fout
<<
" "
;
}
// Add standard libraries for this language.
std
::
string
standardLibsVar
=
"CMAKE_"
;
standardLibsVar
+=
cli
.
GetLinkLanguage
();
standardLibsVar
+=
"_STANDARD_LIBRARIES"
;
std
::
string
stdLibString
;
if
(
const
char
*
stdLibs
=
this
->
Makefile
->
GetDefinition
(
standardLibsVar
))
{
stdLibString
=
stdLibs
;
}
if
(
!
stdLibString
.
empty
())
{
fout
<<
stdLibString
<<
" "
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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