summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-07-25 16:43:28 (GMT)
committerBrad King <brad.king@kitware.com>2015-07-29 14:43:33 (GMT)
commit29e8b7bfcc8b3530fb4fd2dd04dca59744588b61 (patch)
treeb86ad62c98a940913e5451aad43a3caf37515a87 /Source/cmGlobalGenerator.cxx
parent1ef9b2b6007356ab26cdec42bdf9c79d53745bf6 (diff)
downloadCMake-29e8b7bfcc8b3530fb4fd2dd04dca59744588b61.zip
CMake-29e8b7bfcc8b3530fb4fd2dd04dca59744588b61.tar.gz
CMake-29e8b7bfcc8b3530fb4fd2dd04dca59744588b61.tar.bz2
cmGlobalGenerator: Create a new Compute step before generation.
Replace the DoGenerate method.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
-rw-r--r--Source/cmGlobalGenerator.cxx4
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 06777e6..390d6b4 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1212,7 +1212,7 @@ bool cmGlobalGenerator::CheckALLOW_DUPLICATE_CUSTOM_TARGETS() const
return false;
}
-void cmGlobalGenerator::DoGenerate()
+void cmGlobalGenerator::Compute()
{
// Some generators track files replaced during the Generate.
// Start with an empty vector:
@@ -1220,8 +1220,6 @@ void cmGlobalGenerator::DoGenerate()
// clear targets to issue warning CMP0042 for
this->CMP0042WarnTargets.clear();
-
- this->Generate();
}
void cmGlobalGenerator::Generate()