From cfbf857b22540059e6d5a6c271af4aa0314aad7e Mon Sep 17 00:00:00 2001 From: Zack Galbreath Date: Mon, 31 Oct 2016 15:58:08 -0400 Subject: cmRulePlaceholderExpander: Fix CMAKE__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__COMPILER_ARG1`. --- Source/cmRulePlaceholderExpander.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source') diff --git a/Source/cmRulePlaceholderExpander.cxx b/Source/cmRulePlaceholderExpander.cxx index 361321e0be..75ac54d655 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 = -- cgit v1.2.1