diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-06 13:19:34 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-04-06 13:19:34 (GMT) |
| commit | 9b7213dc47d2477cb4ceb5032a9078412b5474bd (patch) | |
| tree | d0372265c5b1f07f9b1a8a6cc9bedf96bed2dbcb /Source/cmGlobalGenerator.cxx | |
| parent | 0e6b00ee494f341be104fa2a00543fc4acd43c6f (diff) | |
| parent | c37cf7fa9e0aa7f7c3a2b32457385a1caf37bc3c (diff) | |
| download | CMake-9b7213dc47d2477cb4ceb5032a9078412b5474bd.zip CMake-9b7213dc47d2477cb4ceb5032a9078412b5474bd.tar.gz CMake-9b7213dc47d2477cb4ceb5032a9078412b5474bd.tar.bz2 | |
Merge topic 'minor-cleanups'
c37cf7fa cmCacheManager: Remove unused method
64556e3d cmCacheManager: Remove unused overloads.
23bb5d22 cmCacheManager: Remove use of intermediate overload.
510562e3 cmGlobalGenerator: Don't fetch the cache manager in a loop.
629e9489 cmake: Clear member rather than explicit erase.
d280bae9 cmake: Be clear that there is no chaining after global properties.
364c7ea1 cmake: Remove unused method.
47acfe1d cmake: Remove unused member.
a469bf7b cmMakefile: Remove one wrong and one insufficiently helpful comment.
257c1649 cmListFile: Remove unused member.
fe17092c cmMakefile: Remove bogus comment.
199b28ac Remove duplicate tag name.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 8123c99..3c0a0e2 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1537,10 +1537,9 @@ void cmGlobalGenerator::CheckLocalGenerators() std::map<std::string, std::string> notFoundMap; // std::set<std::string> notFoundMap; // after it is all done do a ConfigureFinalPass - cmCacheManager* manager = 0; + cmCacheManager* manager = this->GetCMakeInstance()->GetCacheManager(); for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i) { - manager = this->LocalGenerators[i]->GetMakefile()->GetCacheManager(); this->LocalGenerators[i]->ConfigureFinalPass(); cmTargets &targets = this->LocalGenerators[i]->GetMakefile()->GetTargets(); |