Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
CMake
CMake
Commits
6cd27a85
Commit
6cd27a85
authored
Oct 09, 2016
by
Stephen Kelly
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmLocalGenerator: Move variable to where it can be used easily
parent
8b0e4795
Pipeline
#31164
passed with stage
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
Source/cmLocalGenerator.cxx
Source/cmLocalGenerator.cxx
+2
-1
No files found.
Source/cmLocalGenerator.cxx
View file @
6cd27a85
...
...
@@ -722,6 +722,8 @@ std::string cmLocalGenerator::ExpandRuleVariable(
std
::
map
<
std
::
string
,
std
::
string
>::
iterator
compIt
=
compilers
.
find
(
variable
);
std
::
string
replace
=
this
->
Makefile
->
GetSafeDefinition
(
variable
);
if
(
compIt
!=
compilers
.
end
())
{
std
::
string
arg1
=
compIt
->
first
+
"_ARG1"
;
compilerArg1
=
this
->
Makefile
->
GetDefinition
(
arg1
);
...
...
@@ -743,7 +745,6 @@ std::string cmLocalGenerator::ExpandRuleVariable(
cmSystemTools
::
ReplaceString
(
actualReplace
,
"${LANG}"
,
lang
);
}
if
(
actualReplace
==
variable
)
{
std
::
string
replace
=
this
->
Makefile
->
GetSafeDefinition
(
variable
);
// if the variable is not a FLAG then treat it like a path
if
(
variable
.
find
(
"_FLAG"
)
==
variable
.
npos
)
{
std
::
string
ret
=
this
->
ConvertToOutputForExisting
(
replace
);
...
...
Brad King
@brad.king
Mentioned in commit
9a2048f1
·
Oct 17, 2016
Mentioned in commit
9a2048f1
Mentioned in commit 9a2048f1ea6687530e209992c3f5eafcbc02b2a9
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