diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-27 13:23:01 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-05-27 13:23:01 (GMT) |
| commit | c12fc3573bd86122279467e662b7ec58c72b5ffa (patch) | |
| tree | 8587222d7561ad92d900b670b4a8adc72d683074 /Source/CTest/cmCTestScriptHandler.cxx | |
| parent | 94e4b5d2c36e541919ebabb8c7f8cca5abf36a09 (diff) | |
| parent | 3b880a07417a0211001b8dfa721ec220e6d8d2e3 (diff) | |
| download | CMake-c12fc3573bd86122279467e662b7ec58c72b5ffa.zip CMake-c12fc3573bd86122279467e662b7ec58c72b5ffa.tar.gz CMake-c12fc3573bd86122279467e662b7ec58c72b5ffa.tar.bz2 | |
Merge topic 'inject-state-snapshot'
3b880a07 cmLocalGenerator: Require a valid cmState::Snapshot in the ctor.
e12afe76 cmState: Host some state from the cmGlobalGenerator.
c7b79aa1 cmGlobalGenerator: Require a cmake instance in ctor.
01e1cd5c cmState: Move snapshot creation to the cmake instance.
Diffstat (limited to 'Source/CTest/cmCTestScriptHandler.cxx')
| -rw-r--r-- | Source/CTest/cmCTestScriptHandler.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
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(); |