kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmGlobalGenerator: Return from Compute whether to generate.

This commit is contained in:
Stephen Kelly 2015-07-25 18:44:58 +02:00 committed by Brad King
parent 29e8b7bfcc
commit fb9355c50e
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmGlobalGenerator.cxx
View File

@ -1212,7 +1212,7 @@ bool cmGlobalGenerator::CheckALLOW_DUPLICATE_CUSTOM_TARGETS() const
return false; return false;
} }
void cmGlobalGenerator::Compute() bool cmGlobalGenerator::Compute()
{ {
// Some generators track files replaced during the Generate. // Some generators track files replaced during the Generate.
// Start with an empty vector: // Start with an empty vector:
@ -1220,16 +1220,17 @@ void cmGlobalGenerator::Compute()
// clear targets to issue warning CMP0042 for // clear targets to issue warning CMP0042 for
this->CMP0042WarnTargets.clear(); this->CMP0042WarnTargets.clear();
// Check whether this generator is allowed to run.
if(!this->CheckALLOW_DUPLICATE_CUSTOM_TARGETS())
{
return false;
}
return true;
} }
void cmGlobalGenerator::Generate() void cmGlobalGenerator::Generate()
{ {
// Check whether this generator is allowed to run.
if(!this->CheckALLOW_DUPLICATE_CUSTOM_TARGETS())
{
return;
}
this->FinalizeTargetCompileInfo(); this->FinalizeTargetCompileInfo();
this->CreateGenerationObjects(); this->CreateGenerationObjects();

2
Source/cmGlobalGenerator.h
View File

@ -86,7 +86,7 @@ public:
*/ */
virtual void Configure(); virtual void Configure();
void Compute(); bool Compute();
enum TargetTypes { enum TargetTypes {
AllTargets, AllTargets,

5
Source/cmake.cxx
View File

@ -1607,7 +1607,10 @@ int cmake::Generate()
{ {
return -1; return -1;
} }
this->GlobalGenerator->Compute(); if (!this->GlobalGenerator->Compute())
{
return -1;
}
this->GlobalGenerator->Generate(); this->GlobalGenerator->Generate();
if ( !this->GraphVizFile.empty() ) if ( !this->GraphVizFile.empty() )
{ {