diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-08-29 07:21:32 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2015-10-05 16:43:18 (GMT) |
commit | 9eea0486bfe5dfd497e6a8fca9e3c2551169c24e (patch) | |
tree | baf04ff246c6b1c4afe5bc90f1d327a8369186a4 /Source/cmGlobalGenerator.cxx | |
parent | 2eca0559881c36061f84ea4fcd955ac32d9d427a (diff) | |
download | CMake-9eea0486bfe5dfd497e6a8fca9e3c2551169c24e.zip CMake-9eea0486bfe5dfd497e6a8fca9e3c2551169c24e.tar.gz CMake-9eea0486bfe5dfd497e6a8fca9e3c2551169c24e.tar.bz2 |
cmGlobalGenerator: Do more computation at compute time.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
-rw-r--r-- | Source/cmGlobalGenerator.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 27f860e..cae5466 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1284,13 +1284,6 @@ bool cmGlobalGenerator::Compute() this->AddExtraIDETargets(); - return true; -} - -void cmGlobalGenerator::Generate() -{ - unsigned int i; - // Trace the dependencies, after that no custom commands should be added // because their dependencies might not be handled correctly for (i = 0; i < this->LocalGenerators.size(); ++i) @@ -1309,9 +1302,16 @@ void cmGlobalGenerator::Generate() // Compute the inter-target dependencies. if(!this->ComputeTargetDepends()) { - return; + return false; } + return true; +} + +void cmGlobalGenerator::Generate() +{ + unsigned int i; + // Create a map from local generator to the complete set of targets // it builds by default. this->InitializeProgressMarks(); |