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
80f57e67
Commit
80f57e67
authored
Oct 08, 2016
by
Stephen Kelly
Browse files
cmLocalGenerator: Separate rpath content from library stream
parent
7ef83468
Pipeline
#30059
passed with stage
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Source/cmLocalGenerator.cxx
View file @
80f57e67
...
...
@@ -1463,32 +1463,34 @@ void cmLocalGenerator::OutputLinkLibraries(
linkLibs
+=
" "
;
}
std
::
string
rpath
;
// Check what kind of rpath flags to use.
if
(
cli
.
GetRuntimeSep
().
empty
())
{
// Each rpath entry gets its own option ("-R a -R b -R c")
std
::
vector
<
std
::
string
>
runtimeDirs
;
cli
.
GetRPath
(
runtimeDirs
,
relink
);
std
::
string
rpath
;
for
(
std
::
vector
<
std
::
string
>::
iterator
ri
=
runtimeDirs
.
begin
();
ri
!=
runtimeDirs
.
end
();
++
ri
)
{
rpath
+=
cli
.
GetRuntimeFlag
();
rpath
+=
this
->
ConvertToOutputFormat
(
*
ri
,
shellFormat
);
rpath
+=
" "
;
}
fout
<<
rpath
;
}
else
{
// All rpath entries are combined ("-Wl,-rpath,a:b:c").
std
::
string
rpath
=
cli
.
GetRPathString
(
relink
);
std
::
string
rpath
String
=
cli
.
GetRPathString
(
relink
);
// Store the rpath option in the stream.
if
(
!
rpath
.
empty
())
{
fout
<<
cli
.
GetRuntimeFlag
();
fout
<<
this
->
EscapeForShell
(
rpath
,
escapeAllowMakeVars
);
fout
<<
" "
;
if
(
!
rpath
String
.
empty
())
{
rpath
+=
cli
.
GetRuntimeFlag
();
rpath
+=
this
->
EscapeForShell
(
rpath
String
,
escapeAllowMakeVars
);
rpath
+=
" "
;
}
}
fout
<<
rpath
;
// Write the library flags to the build rule.
fout
<<
linkLibs
;
...
...
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