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

Merge topic 'graphviz-at-generate-time' 

6cf5564 Generate graphviz files at generate time, not configure time.
This commit is contained in:
Brad King 2013-10-07 15:42:13 -04:00 committed by CMake Topic Stage
parent 5a4ec661cf 6cf55644ef
commit b61960564a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmake.cxx
View File

@ -2437,11 +2437,6 @@ int cmake::ActualConfigure()
{ {
this->CacheManager->SaveCache(this->GetHomeOutputDirectory()); this->CacheManager->SaveCache(this->GetHomeOutputDirectory());
} }
if ( !this->GraphVizFile.empty() )
{
std::cout << "Generate graphviz: " << this->GraphVizFile << std::endl;
this->GenerateGraphViz(this->GraphVizFile.c_str());
}
if(cmSystemTools::GetErrorOccuredFlag()) if(cmSystemTools::GetErrorOccuredFlag())
{ {
return -1; return -1;
@ -2604,6 +2599,11 @@ int cmake::Generate()
return -1; return -1;
} }
this->GlobalGenerator->Generate(); this->GlobalGenerator->Generate();
if ( !this->GraphVizFile.empty() )
{
std::cout << "Generate graphviz: " << this->GraphVizFile << std::endl;
this->GenerateGraphViz(this->GraphVizFile.c_str());
}
if(this->WarnUnusedCli) if(this->WarnUnusedCli)
{ {
this->RunCheckForUnusedVariables(); this->RunCheckForUnusedVariables();