diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-02 12:35:29 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-11-02 12:35:29 (GMT) |
| commit | f6b93fbf3ae00a9157af2f6497bed074d585cea9 (patch) | |
| tree | 3e7a059eaba5817302164226a6cf9a90bcf436cf | |
| parent | 6a65f0534b7f62ba6fece4b422eaffcdeb3cc535 (diff) | |
| parent | cfbf857b22540059e6d5a6c271af4aa0314aad7e (diff) | |
| download | CMake-f6b93fbf3ae00a9157af2f6497bed074d585cea9.zip CMake-f6b93fbf3ae00a9157af2f6497bed074d585cea9.tar.gz CMake-f6b93fbf3ae00a9157af2f6497bed074d585cea9.tar.bz2 | |
Merge topic 'fix_compiler_arg1'
cfbf857b cmRulePlaceholderExpander: Fix CMAKE_<LANG>_COMPILER_ARG1 replacement
| -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 = |