[Cmake-commits] CMake branch, next, updated. v2.8.3-1270-gc436663

[Brad King]

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  c436663e4c64fc29aaf3837fd486f4f83f971036 (commit)
       via  6228abed9b5856729274e680cbe64952245769d0 (commit)
      from  5f8ba54c2cd46702c0b0339e5a02d1f06d0c993d (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=c436663e4c64fc29aaf3837fd486f4f83f971036
commit c436663e4c64fc29aaf3837fd486f4f83f971036
Merge: 5f8ba54 6228abe
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 10 10:19:39 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 10 10:19:39 2011 -0500

    Merge topic 'ctest-launch-empty-rule' into next
    
    6228abe CTest: Teach launcher to ignore empty/no-op make commands


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6228abed9b5856729274e680cbe64952245769d0
commit 6228abed9b5856729274e680cbe64952245769d0
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Thu Jan 6 13:00:18 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 10 10:17:13 2011 -0500

    CTest: Teach launcher to ignore empty/no-op make commands

diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx
index 8e305b7..9831d02 100644
--- a/Source/CTest/cmCTestLaunch.cxx
+++ b/Source/CTest/cmCTestLaunch.cxx
@@ -220,6 +220,13 @@ void cmCTestLaunch::ComputeFileNames()
 //----------------------------------------------------------------------------
 void cmCTestLaunch::RunChild()
 {
+  // Ignore noopt make rules
+  if(this->RealArgs.empty() || this->RealArgs[0] == ":")
+    {
+    this->ExitCode = 0;
+    return;
+    }
+
   // Prepare to run the real command.
   cmsysProcess* cp = this->Process;
   cmsysProcess_SetCommand(cp, this->RealArgV);

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

Summary of changes:
 Source/CTest/cmCTestLaunch.cxx |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake