diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-06 23:17:48 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-08 22:00:19 (GMT) |
| commit | 12cb3bdce4b40c39b8697bbf89ea8aace6aeae8b (patch) | |
| tree | 22424e05eb3914000b2eb8f95cad7a55c13ef127 /Source/cmGlobalGenerator.cxx | |
| parent | 72efa15dc26b5f63a477ec537edfdffb54ecb691 (diff) | |
| download | CMake-12cb3bdce4b40c39b8697bbf89ea8aace6aeae8b.zip CMake-12cb3bdce4b40c39b8697bbf89ea8aace6aeae8b.tar.gz CMake-12cb3bdce4b40c39b8697bbf89ea8aace6aeae8b.tar.bz2 | |
cmLocalGenerator: Add Home directory accessors.
Reduce reasons for cmLocalGenerator to have a cmMakefile.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index eb4dfee..c7e09b9 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -399,7 +399,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages, bool fatalError = false; mf->AddDefinition("RUN_CONFIGURE", true); - std::string rootBin = mf->GetHomeOutputDirectory(); + std::string rootBin = this->CMakeInstance->GetHomeOutputDirectory(); rootBin += cmake::GetCMakeFilesDirectory(); // If the configuration files path has been set, @@ -2879,10 +2879,8 @@ void cmGlobalGenerator::WriteRuleHashes(std::string const& pfile) //---------------------------------------------------------------------------- void cmGlobalGenerator::WriteSummary() { - cmMakefile* mf = this->LocalGenerators[0]->GetMakefile(); - // Record all target directories in a central location. - std::string fname = mf->GetHomeOutputDirectory(); + std::string fname = this->CMakeInstance->GetHomeOutputDirectory(); fname += cmake::GetCMakeFilesDirectory(); fname += "/TargetDirectories.txt"; cmGeneratedFileStream fout(fname.c_str()); |