summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2012-08-30 15:54:13 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2012-08-30 15:54:13 (GMT)
commit907019b33861caef52c15ab9279ca3a40a6e8be3 (patch)
tree9e3a5838de6f073c8492ae575e4a3c5b00127db2
parent0d094e3a77b52b0f5f462a1d397d410bccbd303a (diff)
parent95e502ee7c9c751d308f5685f048ba1b555cc038 (diff)
downloadCMake-907019b33861caef52c15ab9279ca3a40a6e8be3.zip
CMake-907019b33861caef52c15ab9279ca3a40a6e8be3.tar.gz
CMake-907019b33861caef52c15ab9279ca3a40a6e8be3.tar.bz2
Merge topic 'ErrorIfCTEST_USE_LAUNCHERSSetButLauncherRuleNotSet'
95e502e error out if CTEST_USE_LAUNCHERS is TRUE but RULE_LAUNCH_* are not set
-rw-r--r--Source/cmake.cxx11
1 files changed, 11 insertions, 0 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index f2a0226..c6787b9 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 )
{