This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 97599787929fd197241dc3e4adcbf852bdf9f76d (commit)
via cfbf857b22540059e6d5a6c271af4aa0314aad7e (commit)
from 3a0b88c121e39bf66e55c5e0e5f126fd0290ab4f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97599787929fd197241dc3e4adcbf852bdf9f76d
commit 97599787929fd197241dc3e4adcbf852bdf9f76d
Merge: 3a0b88c cfbf857
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 1 10:01:01 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Nov 1 10:01:01 2016 -0400
Merge topic 'fix_compiler_arg1' into next
cfbf857b cmRulePlaceholderExpander: Fix CMAKE_<LANG>_COMPILER_ARG1
replacement
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfbf857b22540059e6d5a6c271af4aa0314aad7e
commit cfbf857b22540059e6d5a6c271af4aa0314aad7e
Author: Zack Galbreath <zack.galbre...@kitware.com>
AuthorDate: Mon Oct 31 15:58:08 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Nov 1 10:00:24 2016 -0400
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`.
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 =
-----------------------------------------------------------------------
Summary of changes:
Source/cmRulePlaceholderExpander.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
