[Cmake-commits] CMake branch, next, updated. v2.8.9-292-g6e6604d

[Alexander Neundorf]

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  6e6604d9797438c86e57936ddaba25108eda4fde (commit)
       via  95e502ee7c9c751d308f5685f048ba1b555cc038 (commit)
      from  19fa7dcb0a78cbab0f5aebb1b38883b3c24b4c2f (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=6e6604d9797438c86e57936ddaba25108eda4fde
commit 6e6604d9797438c86e57936ddaba25108eda4fde
Merge: 19fa7dc 95e502e
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Mon Aug 27 14:50:33 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 27 14:50:33 2012 -0400

    Merge topic 'ErrorIfCTEST_USE_LAUNCHERSSetButLauncherRuleNotSet' into next
    
    95e502e error out if CTEST_USE_LAUNCHERS is TRUE but RULE_LAUNCH_* are not set


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95e502ee7c9c751d308f5685f048ba1b555cc038
commit 95e502ee7c9c751d308f5685f048ba1b555cc038
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Mon Aug 20 23:19:44 2012 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Mon Aug 20 23:19:44 2012 +0200

    error out if CTEST_USE_LAUNCHERS is TRUE but RULE_LAUNCH_* are not set
    
    Otherwise, CTEST_USE_LAUNCHERS can be set to true in a driving ctest
    script, and everything looks like it would work and reports 0 build errors,
    but actually there can be any amount of errors and they are just not reported.
    By adding this check cmake now errors out if CTEST_USE_LAUNCHERS is enabled, but
    the RULE properties are not set, which would lead to a not-working ctest run.
    
    Alex

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 75aa471..08c2329 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2326,6 +2326,17 @@ int cmake::ActualConfigure()
     this->CacheManager->RemoveCacheEntry("CMAKE_GENERATOR");
     this->CacheManager->RemoveCacheEntry("CMAKE_EXTRA_GENERATOR");
     }
+
+  cmMakefile* mf=this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
+  if (mf->IsOn("CTEST_USE_LAUNCHERS")
+              && !this->GetProperty("RULE_LAUNCH_COMPILE", cmProperty::GLOBAL))
+    {
+    cmSystemTools::Error("CTEST_USE_LAUNCHERS is enabled, but the "
+                        "RULE_LAUNCH_COMPILE global property is not defined.\n"
+                        "Did you forget to include(CTest) in the toplevel "
+                         "CMakeLists.txt ?");
+    }
+
   // only save the cache if there were no fatal errors
   if ( this->GetWorkingMode() == NORMAL_MODE )
     {

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

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


hooks/post-receive
-- 
CMake