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, master has been updated via 73909e242138ba01c1ce5ebe04fa16a9a8e2e675 (commit) via 666ad1df2dc5b181a40d831c125529fe7e9bf0b4 (commit) from adcade6088a8bbe19002ac88f724d25ac95597c5 (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=73909e242138ba01c1ce5ebe04fa16a9a8e2e675 commit 73909e242138ba01c1ce5ebe04fa16a9a8e2e675 Merge: adcade6 666ad1d Author: Brad King <brad.k...@kitware.com> AuthorDate: Mon Feb 27 09:11:17 2017 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Feb 27 09:11:17 2017 -0500 Merge topic 'ninja-no-full-path' 666ad1df Revert "Ninja: Use full path for all source files" diff --cc Source/cmNinjaTargetGenerator.cxx index f096416,5c85dfa..b1f26e4 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@@ -380,12 -373,11 +380,12 @@@ void cmNinjaTargetGenerator::WriteLangu void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang) { - cmLocalGenerator::RuleVariables vars; - vars.RuleLauncher = "RULE_LAUNCH_COMPILE"; - vars.CMTarget = this->GetGeneratorTarget(); + cmRulePlaceholderExpander::RuleVariables vars; + vars.CMTargetName = this->GetGeneratorTarget()->GetName().c_str(); + vars.CMTargetType = + cmState::GetTargetTypeName(this->GetGeneratorTarget()->GetType()); vars.Language = lang.c_str(); - vars.Source = "$IN_ABS"; + vars.Source = "$in"; vars.Object = "$out"; vars.Defines = "$DEFINES"; vars.Includes = "$INCLUDES"; ----------------------------------------------------------------------- Summary of changes: Source/cmNinjaTargetGenerator.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits