diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-15 22:50:59 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-20 22:12:51 (GMT) |
| commit | 044dc81504e0d34d7c84a20d333b2177a2c86b54 (patch) | |
| tree | 3f1bd08ea4cf15e80c4b2417d81162df6cf6f420 /Source/cmGlobalGenerator.cxx | |
| parent | d67e8f24b89b70782c977b4db628377be875f938 (diff) | |
| download | CMake-044dc81504e0d34d7c84a20d333b2177a2c86b54.zip CMake-044dc81504e0d34d7c84a20d333b2177a2c86b54.tar.gz CMake-044dc81504e0d34d7c84a20d333b2177a2c86b54.tar.bz2 | |
Use the Home directories from the cmake class where intended.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 10 |
1 files changed, 5 insertions, 5 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()) |