kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmake: Initialize Home directories on cmake for find-package mode. 

The Home directories can be used to initialize cmMakefile directories
internally.
This commit is contained in:
Stephen Kelly 2015-04-16 21:09:16 +02:00
parent 044dc81504
commit 8878bea7b6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmake.cxx
View File

@ -405,6 +405,11 @@ void cmake::ReadListFile(const std::vector<std::string>& args,
bool cmake::FindPackage(const std::vector<std::string>& args) bool cmake::FindPackage(const std::vector<std::string>& args)
{ {
this->SetHomeDirectory
(cmSystemTools::GetCurrentWorkingDirectory());
this->SetHomeOutputDirectory
(cmSystemTools::GetCurrentWorkingDirectory());
// if a generator was not yet created, temporarily create one // if a generator was not yet created, temporarily create one
cmGlobalGenerator *gg = new cmGlobalGenerator; cmGlobalGenerator *gg = new cmGlobalGenerator;
gg->SetCMakeInstance(this); gg->SetCMakeInstance(this);
@ -413,12 +418,8 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
// read in the list file to fill the cache // read in the list file to fill the cache
cmsys::auto_ptr<cmLocalGenerator> lg(gg->CreateLocalGenerator()); cmsys::auto_ptr<cmLocalGenerator> lg(gg->CreateLocalGenerator());
cmMakefile* mf = lg->GetMakefile(); cmMakefile* mf = lg->GetMakefile();
mf->SetHomeOutputDirectory
(cmSystemTools::GetCurrentWorkingDirectory());
mf->SetStartOutputDirectory mf->SetStartOutputDirectory
(cmSystemTools::GetCurrentWorkingDirectory()); (cmSystemTools::GetCurrentWorkingDirectory());
mf->SetHomeDirectory
(cmSystemTools::GetCurrentWorkingDirectory());
mf->SetStartDirectory mf->SetStartDirectory
(cmSystemTools::GetCurrentWorkingDirectory()); (cmSystemTools::GetCurrentWorkingDirectory());