diff options
| author | Zack Galbreath <zack.galbreath@kitware.com> | 2016-10-31 19:58:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-11-01 14:00:24 (GMT) |
| commit | cfbf857b22540059e6d5a6c271af4aa0314aad7e (patch) | |
| tree | f31d8b17e5316b9c255771d51e17828a31c057e7 | |
| parent | 098a18c476b5e60b3bacc0e47f23359fc4a3ea2c (diff) | |
| download | CMake-cfbf857b22540059e6d5a6c271af4aa0314aad7e.zip CMake-cfbf857b22540059e6d5a6c271af4aa0314aad7e.tar.gz CMake-cfbf857b22540059e6d5a6c271af4aa0314aad7e.tar.bz2 | |
cmRulePlaceholderExpander: Fix CMAKE_<LANG>_COMPILER_ARG1 replacement
Refactoring in commit b29425f7 (cmLocalGenerator: Populate a container
of mappings for replacements, 2016-10-09) broke substitution of this
placeholder by storing the wrong key in the new replacement map.
Use the proper key, `CMAKE_<LANG>_COMPILER_ARG1`.
| -rw-r--r-- | Source/cmRulePlaceholderExpander.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmRulePlaceholderExpander.cxx b/Source/cmRulePlaceholderExpander.cxx index 361321e..75ac54d 100644 --- a/Source/cmRulePlaceholderExpander.cxx +++ b/Source/cmRulePlaceholderExpander.cxx @@ -212,7 +212,7 @@ std::string cmRulePlaceholderExpander::ExpandRuleVariable( std::string ret = outputConverter->ConvertToOutputForExisting( this->VariableMappings["CMAKE_" + compIt->second + "_COMPILER"]); std::string const& compilerArg1 = - this->VariableMappings[compIt->first + "_COMPILER_ARG1"]; + this->VariableMappings["CMAKE_" + compIt->second + "_COMPILER_ARG1"]; std::string const& compilerTarget = this->VariableMappings["CMAKE_" + compIt->second + "_COMPILER_TARGET"]; std::string const& compilerOptionTarget = |