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
011e6870
Commit
011e6870
authored
Oct 08, 2016
by
Stephen Kelly
Browse files
cmLocalGenerator: Use a std::string instead of char*
parent
cbca80f3
Pipeline
#30055
passed with stage
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Source/cmLocalGenerator.cxx
View file @
011e6870
...
...
@@ -1431,8 +1431,9 @@ void cmLocalGenerator::OutputLinkLibraries(
std
::
string
fwSearchFlagVar
=
"CMAKE_"
;
fwSearchFlagVar
+=
linkLanguage
;
fwSearchFlagVar
+=
"_FRAMEWORK_SEARCH_FLAG"
;
const
char
*
fwSearchFlag
=
this
->
Makefile
->
GetDefinition
(
fwSearchFlagVar
);
if
(
fwSearchFlag
&&
*
fwSearchFlag
)
{
std
::
string
fwSearchFlag
=
this
->
Makefile
->
GetSafeDefinition
(
fwSearchFlagVar
);
if
(
!
fwSearchFlag
.
empty
())
{
std
::
vector
<
std
::
string
>
const
&
fwDirs
=
cli
.
GetFrameworkPaths
();
for
(
std
::
vector
<
std
::
string
>::
const_iterator
fdi
=
fwDirs
.
begin
();
fdi
!=
fwDirs
.
end
();
++
fdi
)
{
...
...
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