diff options
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 10 | ||||
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 0492a4c..786f8fa 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1098,13 +1098,13 @@ void cmGlobalGenerator::Configure() this->LocalGenerators.push_back(lg); // set the Start directories - cmMakefile* mf = lg->GetMakefile(); lg->GetMakefile()->SetStartDirectory - (this->CMakeInstance->GetStartDirectory()); + (this->CMakeInstance->GetHomeDirectory()); lg->GetMakefile()->SetStartOutputDirectory - (this->CMakeInstance->GetStartOutputDirectory()); + (this->CMakeInstance->GetHomeOutputDirectory()); - this->BinaryDirectories.insert(mf->GetStartOutputDirectory()); + this->BinaryDirectories.insert( + this->CMakeInstance->GetHomeOutputDirectory()); // now do it lg->Configure(); @@ -3069,7 +3069,7 @@ bool cmGlobalGenerator::GenerateCPackPropertiesFile() std::vector<std::string> configs; std::string config = mf->GetConfigurations(configs, false); - std::string path = this->CMakeInstance->GetStartOutputDirectory(); + std::string path = this->CMakeInstance->GetHomeOutputDirectory(); path += "/CPackProperties.cmake"; if(!cmSystemTools::FileExists(path.c_str()) && installedFiles.empty()) diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 3deaec2..73d3dc2 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -584,9 +584,9 @@ void cmGlobalUnixMakefileGenerator3 (this->CreateLocalGenerator()); // set the Start directories lg->GetMakefile()->SetStartDirectory - (this->CMakeInstance->GetStartDirectory()); + (this->CMakeInstance->GetHomeDirectory()); lg->GetMakefile()->SetStartOutputDirectory - (this->CMakeInstance->GetStartOutputDirectory()); + (this->CMakeInstance->GetHomeOutputDirectory()); } std::string tname = targetName; |