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 fc923d1e5bfc8dd77a372cf0b58c63a7729b1dc7 (commit) via 0eae83d7a471359e4b7105730a2f3fc85dde31a5 (commit) from f7b2445b69a3ab45854952f40de5f8afbc96bc9c (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 ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc923d1e5bfc8dd77a372cf0b58c63a7729b1dc7 commit fc923d1e5bfc8dd77a372cf0b58c63a7729b1dc7 Merge: f7b2445 0eae83d Author: Brad King <brad.k...@kitware.com> AuthorDate: Sat Mar 8 13:04:11 2014 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sat Mar 8 13:04:11 2014 -0500 Merge topic 'dev/string-apis' into next 0eae83d7 cmLocalGenerator: Do not use NULL RuleLauncher http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0eae83d7a471359e4b7105730a2f3fc85dde31a5 commit 0eae83d7a471359e4b7105730a2f3fc85dde31a5 Author: Brad King <brad.k...@kitware.com> AuthorDate: Sat Mar 8 13:04:24 2014 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Sat Mar 8 13:04:24 2014 -0500 cmLocalGenerator: Do not use NULL RuleLauncher diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index fabab33..761db48 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1156,8 +1156,11 @@ void cmLocalGenerator::ExpandRuleVariables(std::string& s, const RuleVariables& replaceValues) { - this->InsertRuleLauncher(s, replaceValues.CMTarget, - replaceValues.RuleLauncher); + if(replaceValues.RuleLauncher) + { + this->InsertRuleLauncher(s, replaceValues.CMTarget, + replaceValues.RuleLauncher); + } std::string::size_type start = s.find('<'); // no variables to expand if(start == s.npos) ----------------------------------------------------------------------- Summary of changes: Source/cmLocalGenerator.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits