Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
CMake
CMake
Commits
8c7facd6
Commit
8c7facd6
authored
Jul 14, 2017
by
Brad King
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'backport-fix-lang-std-option-list' into release-3.9
parents
13e9a370
218ce158
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
+10
-2
Source/cmLocalGenerator.cxx
Source/cmLocalGenerator.cxx
+10
-2
No files found.
Source/cmLocalGenerator.cxx
View file @
8c7facd6
...
...
@@ -1591,7 +1591,11 @@ void cmLocalGenerator::AddCompilerRequirementFlag(
const
char
*
opt
=
target
->
Target
->
GetMakefile
()
->
GetRequiredDefinition
(
option_flag
);
this
->
AppendFlagEscape
(
flags
,
opt
);
std
::
vector
<
std
::
string
>
optVec
;
cmSystemTools
::
ExpandListArgument
(
opt
,
optVec
);
for
(
size_t
i
=
0
;
i
<
optVec
.
size
();
++
i
)
{
this
->
AppendFlagEscape
(
flags
,
optVec
[
i
]);
}
return
;
}
...
...
@@ -1601,7 +1605,11 @@ void cmLocalGenerator::AddCompilerRequirementFlag(
if
(
const
char
*
opt
=
target
->
Target
->
GetMakefile
()
->
GetDefinition
(
option_flag
))
{
this
->
AppendFlagEscape
(
flags
,
opt
);
std
::
vector
<
std
::
string
>
optVec
;
cmSystemTools
::
ExpandListArgument
(
opt
,
optVec
);
for
(
size_t
i
=
0
;
i
<
optVec
.
size
();
++
i
)
{
this
->
AppendFlagEscape
(
flags
,
optVec
[
i
]);
}
return
;
}
}
...
...
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