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

Use the Home directories from the cmake class where intended.

This commit is contained in:
Stephen Kelly 2015-04-16 00:50:59 +02:00
parent d67e8f24b8
commit 044dc81504
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmGlobalGenerator.cxx
View File

@ -1098,13 +1098,13 @@ void cmGlobalGenerator::Configure()
this->LocalGenerators.push_back(lg); this->LocalGenerators.push_back(lg);
// set the Start directories // set the Start directories
cmMakefile* mf = lg->GetMakefile();
lg->GetMakefile()->SetStartDirectory lg->GetMakefile()->SetStartDirectory
(this->CMakeInstance->GetStartDirectory()); (this->CMakeInstance->GetHomeDirectory());
lg->GetMakefile()->SetStartOutputDirectory lg->GetMakefile()->SetStartOutputDirectory
(this->CMakeInstance->GetStartOutputDirectory()); (this->CMakeInstance->GetHomeOutputDirectory());
this->BinaryDirectories.insert(mf->GetStartOutputDirectory()); this->BinaryDirectories.insert(
this->CMakeInstance->GetHomeOutputDirectory());
// now do it // now do it
lg->Configure(); lg->Configure();
@ -3069,7 +3069,7 @@ bool cmGlobalGenerator::GenerateCPackPropertiesFile()
std::vector<std::string> configs; std::vector<std::string> configs;
std::string config = mf->GetConfigurations(configs, false); std::string config = mf->GetConfigurations(configs, false);
std::string path = this->CMakeInstance->GetStartOutputDirectory(); std::string path = this->CMakeInstance->GetHomeOutputDirectory();
path += "/CPackProperties.cmake"; path += "/CPackProperties.cmake";
if(!cmSystemTools::FileExists(path.c_str()) && installedFiles.empty()) if(!cmSystemTools::FileExists(path.c_str()) && installedFiles.empty())

4
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@ -584,9 +584,9 @@ void cmGlobalUnixMakefileGenerator3
(this->CreateLocalGenerator()); (this->CreateLocalGenerator());
// set the Start directories // set the Start directories
lg->GetMakefile()->SetStartDirectory lg->GetMakefile()->SetStartDirectory
(this->CMakeInstance->GetStartDirectory()); (this->CMakeInstance->GetHomeDirectory());
lg->GetMakefile()->SetStartOutputDirectory lg->GetMakefile()->SetStartOutputDirectory
(this->CMakeInstance->GetStartOutputDirectory()); (this->CMakeInstance->GetHomeOutputDirectory());
} }
std::string tname = targetName; std::string tname = targetName;