Merge topic 'fix_compiler_arg1'

cfbf857b cmRulePlaceholderExpander: Fix CMAKE_<LANG>_COMPILER_ARG1 replacement
This commit is contained in:
Brad King
2016-11-02 08:35:29 -04:00
committed by CMake Topic Stage

View File

@@ -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 =