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
69295812
Commit
69295812
authored
Oct 08, 2016
by
Stephen Kelly
Browse files
Makefiles: Port CreateLinkLibs to cmLinkLineComputer
parent
5b361fdd
Pipeline
#30061
passed with stage
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Source/cmMakefileExecutableTargetGenerator.cxx
View file @
69295812
...
...
@@ -303,10 +303,14 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
// Set path conversion for link script shells.
this
->
LocalGenerator
->
SetLinkScriptShell
(
useLinkScript
);
CM_AUTO_PTR
<
cmLinkLineComputer
>
linkLineComputer
(
this
->
CreateLinkLineComputer
(
this
->
LocalGenerator
->
GetStateSnapshot
().
GetDirectory
()));
// Collect up flags to link in needed libraries.
std
::
string
linkLibs
;
this
->
CreateLinkLibs
(
linkLi
bs
,
relink
,
useResponseFileForLibs
,
depends
,
useWatcomQuote
);
this
->
CreateLinkLibs
(
linkLi
neComputer
.
get
(),
linkLibs
,
relink
,
useResponseFileForLibs
,
depends
,
useWatcomQuote
);
// Construct object file lists that may be needed to expand the
// rule.
...
...
Source/cmMakefileLibraryTargetGenerator.cxx
View file @
69295812
...
...
@@ -502,8 +502,13 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules(
// Collect up flags to link in needed libraries.
std
::
string
linkLibs
;
if
(
this
->
GeneratorTarget
->
GetType
()
!=
cmState
::
STATIC_LIBRARY
)
{
this
->
CreateLinkLibs
(
linkLibs
,
relink
,
useResponseFileForLibs
,
depends
,
useWatcomQuote
);
CM_AUTO_PTR
<
cmLinkLineComputer
>
linkLineComputer
(
this
->
CreateLinkLineComputer
(
this
->
LocalGenerator
->
GetStateSnapshot
().
GetDirectory
()));
this
->
CreateLinkLibs
(
linkLineComputer
.
get
(),
linkLibs
,
relink
,
useResponseFileForLibs
,
depends
,
useWatcomQuote
);
}
// Construct object file lists that may be needed to expand the
...
...
Source/cmMakefileTargetGenerator.cxx
View file @
69295812
...
...
@@ -1599,18 +1599,14 @@ cmLinkLineComputer* cmMakefileTargetGenerator::CreateLinkLineComputer(
}
void
cmMakefileTargetGenerator
::
CreateLinkLibs
(
std
::
string
&
linkLibs
,
bool
relink
,
bool
useResponseFile
,
std
::
vector
<
std
::
string
>&
makefile_depends
,
bool
useWatcomQuote
)
cmLinkLineComputer
*
linkLineComputer
,
std
::
string
&
linkLibs
,
bool
relink
,
bool
useResponseFile
,
std
::
vector
<
std
::
string
>&
makefile_depends
,
bool
useWatcomQuote
)
{
std
::
string
frameworkPath
;
std
::
string
linkPath
;
CM_AUTO_PTR
<
cmLinkLineComputer
>
linkLineComputer
(
this
->
CreateLinkLineComputer
(
this
->
LocalGenerator
->
GetStateSnapshot
().
GetDirectory
()));
this
->
LocalGenerator
->
OutputLinkLibraries
(
linkLineComputer
.
get
()
,
linkLibs
,
frameworkPath
,
linkPath
,
linkLineComputer
,
linkLibs
,
frameworkPath
,
linkPath
,
*
this
->
GeneratorTarget
,
relink
,
useResponseFile
,
useWatcomQuote
);
linkLibs
=
frameworkPath
+
linkPath
+
linkLibs
;
...
...
Source/cmMakefileTargetGenerator.h
View file @
69295812
...
...
@@ -20,6 +20,7 @@ class cmGeneratedFileStream;
class
cmGeneratorTarget
;
class
cmGlobalUnixMakefileGenerator3
;
class
cmSourceFile
;
class
cmLinkLineComputer
;
/** \class cmMakefileTargetGenerator
* \brief Support Routines for writing makefiles
...
...
@@ -151,7 +152,8 @@ protected:
bool
CheckUseResponseFileForLibraries
(
std
::
string
const
&
l
)
const
;
/** Create list of flags for link libraries. */
void
CreateLinkLibs
(
std
::
string
&
linkLibs
,
bool
relink
,
bool
useResponseFile
,
void
CreateLinkLibs
(
cmLinkLineComputer
*
linkLineComputer
,
std
::
string
&
linkLibs
,
bool
relink
,
bool
useResponseFile
,
std
::
vector
<
std
::
string
>&
makefile_depends
,
bool
useWatcomQuote
);
...
...
Brad King
@brad.king
Mentioned in commit
656ebaca
·
Oct 10, 2016
Mentioned in commit
656ebaca
Mentioned in commit 656ebaca3be50e92edca3d9628b784f5ff1e6a99
Toggle commit list
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