diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-13 19:48:46 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-13 22:16:20 (GMT) |
| commit | 20b95ef8c83fbcb7705e72c85c9de18ff420562f (patch) | |
| tree | 7241038f255ebe43bd6fefd8e2efd7533ae3167d /Source/CTest | |
| parent | 841164cb36650574a1a7363c78e4cdf28d5d37fd (diff) | |
| download | CMake-20b95ef8c83fbcb7705e72c85c9de18ff420562f.zip CMake-20b95ef8c83fbcb7705e72c85c9de18ff420562f.tar.gz CMake-20b95ef8c83fbcb7705e72c85c9de18ff420562f.tar.bz2 | |
cmState: Initialize default definitions immediately.
Don't leave this as cmMakefile responsibility.
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestLaunch.cxx | 1 | ||||
| -rw-r--r-- | Source/CTest/cmCTestScriptHandler.cxx | 1 | ||||
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx index ca5d05a..749a5be 100644 --- a/Source/CTest/cmCTestLaunch.cxx +++ b/Source/CTest/cmCTestLaunch.cxx @@ -736,6 +736,7 @@ void cmCTestLaunch::LoadConfig() cmake cm; cm.SetHomeDirectory(""); cm.SetHomeOutputDirectory(""); + cm.GetCurrentSnapshot().SetDefaultDefinitions(); cmGlobalGenerator gg(&cm); cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(&gg, cm.GetCurrentSnapshot())); std::string fname = this->LogDir; diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index b9016af..ee15271 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/Source/CTest/cmCTestScriptHandler.cxx @@ -314,6 +314,7 @@ void cmCTestScriptHandler::CreateCMake() this->CMake = new cmake; this->CMake->SetHomeDirectory(""); this->CMake->SetHomeOutputDirectory(""); + this->CMake->GetCurrentSnapshot().SetDefaultDefinitions(); this->CMake->AddCMakePaths(); this->GlobalGenerator = new cmGlobalGenerator(this->CMake); diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 968a307..fa3b416 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -1590,6 +1590,7 @@ void cmCTestTestHandler::GetListOfTests() cmake cm; cm.SetHomeDirectory(""); cm.SetHomeOutputDirectory(""); + cm.GetCurrentSnapshot().SetDefaultDefinitions(); cmGlobalGenerator gg(&cm); cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(&gg, cm.GetCurrentSnapshot())); mf->AddDefinition("CTEST_CONFIGURATION_TYPE", |