[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1170-g6d50924

[Peter Kuemmel]

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  6d50924598c39b42528422542e8716f30b60b3d9 (commit)
       via  9fc2e20244a2c8b01c23cd06031388aa85e50117 (commit)
       via  965358fcf64cf1a3693bcdd66f723729e0614ef6 (commit)
      from  18be2992cfb7add736e00e405a0d8db7c7116003 (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=6d50924598c39b42528422542e8716f30b60b3d9
commit 6d50924598c39b42528422542e8716f30b60b3d9
Merge: 18be299 9fc2e20
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sat Dec 1 02:38:46 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Dec 1 02:38:46 2012 -0500

    Merge topic 'ninja_launchers' into next
    
    9fc2e20 Ninja: fix usage of cldeps with ctest launchers
    965358f enable CTEST_USE_LAUNCHERS with Ninja too


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fc2e20244a2c8b01c23cd06031388aa85e50117
commit 9fc2e20244a2c8b01c23cd06031388aa85e50117
Author:     Mathias Gaunard <mathias at gaunard.com>
AuthorDate: Fri Nov 30 03:38:25 2012 +0100
Commit:     Mathias Gaunard <mathias at gaunard.com>
CommitDate: Fri Nov 30 03:46:55 2012 +0100

    Ninja: fix usage of cldeps with ctest launchers

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 5b1dfc8..15842e4 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -423,17 +423,19 @@ cmNinjaTargetGenerator
   std::vector<std::string> compileCmds;
   cmSystemTools::ExpandListArgument(compileCmd, compileCmds);
 
+  if(useClDeps)
+    {
+    std::string cmdPrefix = clDepsBinary + lang + " $in \"$DEP_FILE\" $out " +
+                            clShowPrefix + clBinary;
+    compileCmds.front().insert(0, cmdPrefix);
+    }
+
   for (std::vector<std::string>::iterator i = compileCmds.begin();
        i != compileCmds.end(); ++i)
     this->GetLocalGenerator()->ExpandRuleVariables(*i, vars);
 
-  std::string cmdLine;
-  if(useClDeps)
-    {
-    cmdLine = clDepsBinary + lang + " $in \"$DEP_FILE\" $out " +
-              clShowPrefix + clBinary;
-    }
-  cmdLine += this->GetLocalGenerator()->BuildCommandLine(compileCmds);
+  std::string cmdLine =
+    this->GetLocalGenerator()->BuildCommandLine(compileCmds);
 
 
   // Write the rule for compiling file of the given language.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=965358fcf64cf1a3693bcdd66f723729e0614ef6
commit 965358fcf64cf1a3693bcdd66f723729e0614ef6
Author:     Mathias Gaunard <mathias at gaunard.com>
AuthorDate: Fri Nov 30 02:21:35 2012 +0100
Commit:     Mathias Gaunard <mathias at gaunard.com>
CommitDate: Fri Nov 30 03:46:55 2012 +0100

    enable CTEST_USE_LAUNCHERS with Ninja too

diff --git a/Modules/CTestUseLaunchers.cmake b/Modules/CTestUseLaunchers.cmake
index 6731d37..24f5f2e 100644
--- a/Modules/CTestUseLaunchers.cmake
+++ b/Modules/CTestUseLaunchers.cmake
@@ -35,7 +35,7 @@ if(NOT DEFINED CTEST_USE_LAUNCHERS AND DEFINED ENV{CTEST_USE_LAUNCHERS_DEFAULT})
     CACHE INTERNAL "CTEST_USE_LAUNCHERS initial value from ENV")
 endif()
 
-if(NOT "${CMAKE_GENERATOR}" MATCHES "Make")
+if(NOT "${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
   set(CTEST_USE_LAUNCHERS 0)
 endif()
 

-----------------------------------------------------------------------

Summary of changes:
 Modules/CTestUseLaunchers.cmake   |    2 +-
 Source/cmNinjaTargetGenerator.cxx |   16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake