diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-24 09:31:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-05-27 13:18:31 (GMT) |
| commit | c7b79aa16adc1117e62bf146c64f97c992ec2e2e (patch) | |
| tree | 66fae23d85d71ff99d8ac1d131696707fcec34b1 /Source/CTest | |
| parent | 01e1cd5c1fc5e2684ec69d4916dd31ed23746055 (diff) | |
| download | CMake-c7b79aa16adc1117e62bf146c64f97c992ec2e2e.zip CMake-c7b79aa16adc1117e62bf146c64f97c992ec2e2e.tar.gz CMake-c7b79aa16adc1117e62bf146c64f97c992ec2e2e.tar.bz2 | |
cmGlobalGenerator: Require a cmake instance in ctor.
It is required anyway, so this makes it explicit.
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestLaunch.cxx | 3 | ||||
| -rw-r--r-- | Source/CTest/cmCTestScriptHandler.cxx | 3 | ||||
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx index 6f43a1e..a8a4a1e 100644 --- a/Source/CTest/cmCTestLaunch.cxx +++ b/Source/CTest/cmCTestLaunch.cxx @@ -752,8 +752,7 @@ void cmCTestLaunch::LoadConfig() cmake cm; cm.SetHomeDirectory(""); cm.SetHomeOutputDirectory(""); - cmGlobalGenerator gg; - gg.SetCMakeInstance(&cm); + cmGlobalGenerator gg(&cm); cmsys::auto_ptr<cmLocalGenerator> lg(gg.MakeLocalGenerator()); cmMakefile* mf = lg->GetMakefile(); std::string fname = this->LogDir; diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index 62c6b46..1e493b0 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/Source/CTest/cmCTestScriptHandler.cxx @@ -339,8 +339,7 @@ void cmCTestScriptHandler::CreateCMake() this->CMake->SetHomeDirectory(""); this->CMake->SetHomeOutputDirectory(""); this->CMake->AddCMakePaths(); - this->GlobalGenerator = new cmGlobalGenerator; - this->GlobalGenerator->SetCMakeInstance(this->CMake); + this->GlobalGenerator = new cmGlobalGenerator(this->CMake); this->LocalGenerator = this->GlobalGenerator->MakeLocalGenerator(); this->Makefile = this->LocalGenerator->GetMakefile(); diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index b1c479e..ab5c11b 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -1573,8 +1573,7 @@ void cmCTestTestHandler::GetListOfTests() cmake cm; cm.SetHomeDirectory(""); cm.SetHomeOutputDirectory(""); - cmGlobalGenerator gg; - gg.SetCMakeInstance(&cm); + cmGlobalGenerator gg(&cm); cmsys::auto_ptr<cmLocalGenerator> lg(gg.MakeLocalGenerator()); cmMakefile *mf = lg->GetMakefile(); mf->AddDefinition("CTEST_CONFIGURATION_TYPE", |