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
CMake
CMake
Commits
2a49d86d
Commit
2a49d86d
authored
Oct 09, 2016
by
Stephen Kelly
Browse files
Makefiles: Inline only use of method
parent
b0301db2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Source/cmMakefileTargetGenerator.cxx
View file @
2a49d86d
...
...
@@ -1217,13 +1217,6 @@ void cmMakefileTargetGenerator::WriteObjectsVariable(
<<
"
\n
"
;
}
void
cmMakefileTargetGenerator
::
WriteObjectsString
(
std
::
string
&
buildObjs
)
{
std
::
vector
<
std
::
string
>
objStrings
;
this
->
WriteObjectsStrings
(
objStrings
);
buildObjs
=
objStrings
[
0
];
}
class
cmMakefileTargetGeneratorObjectStrings
{
public:
...
...
@@ -1677,7 +1670,9 @@ void cmMakefileTargetGenerator::CreateObjectLists(
}
}
else
if
(
useLinkScript
)
{
if
(
!
useArchiveRules
)
{
this
->
WriteObjectsString
(
buildObjs
);
std
::
vector
<
std
::
string
>
objStrings
;
this
->
WriteObjectsStrings
(
objStrings
);
buildObjs
=
objStrings
[
0
];
}
}
else
{
buildObjs
=
"$("
;
...
...
Source/cmMakefileTargetGenerator.h
View file @
2a49d86d
...
...
@@ -112,7 +112,6 @@ protected:
void
WriteObjectsVariable
(
std
::
string
&
variableName
,
std
::
string
&
variableNameExternal
,
bool
useWatcomQuote
);
void
WriteObjectsString
(
std
::
string
&
buildObjs
);
void
WriteObjectsStrings
(
std
::
vector
<
std
::
string
>&
objStrings
,
std
::
string
::
size_type
limit
=
std
::
string
::
npos
);
...
...
Brad King
@brad.king
Mentioned in commit
8fe948c5
·
Oct 10, 2016
Mentioned in commit
8fe948c5
Mentioned in commit 8fe948c54cd0a7a06b5c56e8a40dab945c5a08e7
Toggle commit list
Write
Preview
Markdown
is supported
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