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

Remove trailing whitespace and minor formatting changes for the dot-code 

Alex
This commit is contained in:
Alex Neundorf 2010-10-31 14:46:09 +01:00
parent e3c46e648b
commit f7d56df39e
1 changed files with 107 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Source/cmake.cxx
View File

@ -2917,8 +2917,9 @@ void cmake::GenerateGraphViz(const char* fileName) const
for ( lit = localGenerators.begin(); lit != localGenerators.end(); ++ lit ) for ( lit = localGenerators.begin(); lit != localGenerators.end(); ++ lit )
{ {
const cmTargets* targets = &((*lit)->GetMakefile()->GetTargets()); const cmTargets* targets = &((*lit)->GetMakefile()->GetTargets());
cmTargets::const_iterator tit; for ( cmTargets::const_iterator tit = targets->begin();
for ( tit = targets->begin(); tit != targets->end(); ++ tit ) tit != targets->end();
++ tit )
{ {
const char* realTargetName = tit->first.c_str(); const char* realTargetName = tit->first.c_str();
if ( ignoreTargetsSet.find(realTargetName) != ignoreTargetsSet.end() ) if ( ignoreTargetsSet.find(realTargetName) != ignoreTargetsSet.end() )
@ -2933,16 +2934,17 @@ void cmake::GenerateGraphViz(const char* fileName) const
targetPtrs[realTargetName] = &tit->second; targetPtrs[realTargetName] = &tit->second;
} }
} }
// Ok, now find all the stuff we link to that is not in cmake // Ok, now find all the stuff we link to that is not in cmake
for ( lit = localGenerators.begin(); lit != localGenerators.end(); ++ lit ) for ( lit = localGenerators.begin(); lit != localGenerators.end(); ++ lit )
{ {
const cmTargets* targets = &((*lit)->GetMakefile()->GetTargets()); const cmTargets* targets = &((*lit)->GetMakefile()->GetTargets());
cmTargets::const_iterator tit; for ( cmTargets::const_iterator tit = targets->begin();
for ( tit = targets->begin(); tit != targets->end(); ++ tit ) tit != targets->end();
++ tit )
{ {
const cmTarget::LinkLibraryVectorType* ll const cmTarget::LinkLibraryVectorType* ll =
= &(tit->second.GetOriginalLinkLibraries()); &(tit->second.GetOriginalLinkLibraries());
cmTarget::LinkLibraryVectorType::const_iterator llit;
const char* realTargetName = tit->first.c_str(); const char* realTargetName = tit->first.c_str();
if ( ignoreTargetsSet.find(realTargetName) != ignoreTargetsSet.end() ) if ( ignoreTargetsSet.find(realTargetName) != ignoreTargetsSet.end() )
{ {
@ -2953,11 +2955,13 @@ void cmake::GenerateGraphViz(const char* fileName) const
{ {
targetDeps[realTargetName] = 1; targetDeps[realTargetName] = 1;
} }
for ( llit = ll->begin(); llit != ll->end(); ++ llit ) for (cmTarget::LinkLibraryVectorType::const_iterator llit = ll->begin();
llit != ll->end();
++ llit )
{ {
const char* libName = llit->first.c_str(); const char* libName = llit->first.c_str();
std::map<cmStdString, cmStdString>::const_iterator tarIt std::map<cmStdString, cmStdString>::const_iterator tarIt =
= targetNamesNodes.find(libName); targetNamesNodes.find(libName);
if ( ignoreTargetsSet.find(libName) != ignoreTargetsSet.end() ) if ( ignoreTargetsSet.find(libName) != ignoreTargetsSet.end() )
{ {
// Skip ignored targets // Skip ignored targets
@ -2986,17 +2990,19 @@ void cmake::GenerateGraphViz(const char* fileName) const
} }
// Write out nodes // Write out nodes
std::map<cmStdString, int>::const_iterator depIt; for(std::map<cmStdString, int>::const_iterator depIt = targetDeps.begin();
for ( depIt = targetDeps.begin(); depIt != targetDeps.end(); ++ depIt ) depIt != targetDeps.end();
++ depIt )
{ {
const char* newTargetName = depIt->first.c_str(); const char* newTargetName = depIt->first.c_str();
std::map<cmStdString, cmStdString>::const_iterator tarIt std::map<cmStdString, cmStdString>::const_iterator tarIt =
= targetNamesNodes.find(newTargetName); targetNamesNodes.find(newTargetName);
if ( tarIt == targetNamesNodes.end() ) if ( tarIt == targetNamesNodes.end() )
{ {
// We should not be here. // We should not be here.
std::cout << __LINE__ << " Cannot find library: " << newTargetName std::cout << __LINE__ << " Cannot find library: " << newTargetName
<< " even though it was added in the previous pass" << std::endl; << " even though it was added in the previous pass"
<< std::endl;
abort(); abort();
} }
@ -3010,7 +3016,8 @@ void cmake::GenerateGraphViz(const char* fileName) const
{ {
// We should not be here. // We should not be here.
std::cout << __LINE__ << " Cannot find library: " << newTargetName std::cout << __LINE__ << " Cannot find library: " << newTargetName
<< " even though it was added in the previous pass" << std::endl; << " even though it was added in the previous pass"
<< std::endl;
abort(); abort();
} }
const cmTarget* tg = tarTypeIt->second; const cmTarget* tg = tarTypeIt->second;
@ -3043,8 +3050,9 @@ void cmake::GenerateGraphViz(const char* fileName) const
for ( lit = localGenerators.begin(); lit != localGenerators.end(); ++ lit ) for ( lit = localGenerators.begin(); lit != localGenerators.end(); ++ lit )
{ {
const cmTargets* targets = &((*lit)->GetMakefile()->GetTargets()); const cmTargets* targets = &((*lit)->GetMakefile()->GetTargets());
cmTargets::const_iterator tit; for (cmTargets::const_iterator tit = targets->begin();
for ( tit = targets->begin(); tit != targets->end(); ++ tit ) tit != targets->end();
++ tit )
{ {
std::map<cmStdString, int>::iterator dependIt std::map<cmStdString, int>::iterator dependIt
= targetDeps.find(tit->first.c_str()); = targetDeps.find(tit->first.c_str());
@ -3052,16 +3060,18 @@ void cmake::GenerateGraphViz(const char* fileName) const
{ {
continue; continue;
} }
std::map<cmStdString, cmStdString>::iterator cmakeTarIt std::map<cmStdString, cmStdString>::iterator cmakeTarIt =
= targetNamesNodes.find(tit->first.c_str()); targetNamesNodes.find(tit->first.c_str());
const cmTarget::LinkLibraryVectorType* ll const cmTarget::LinkLibraryVectorType* ll =
= &(tit->second.GetOriginalLinkLibraries()); &(tit->second.GetOriginalLinkLibraries());
cmTarget::LinkLibraryVectorType::const_iterator llit;
for ( llit = ll->begin(); llit != ll->end(); ++ llit ) for (cmTarget::LinkLibraryVectorType::const_iterator llit = ll->begin();
llit != ll->end();
++ llit )
{ {
const char* libName = llit->first.c_str(); const char* libName = llit->first.c_str();
std::map<cmStdString, cmStdString>::const_iterator tarIt std::map<cmStdString, cmStdString>::const_iterator tarIt =
= targetNamesNodes.find(libName); targetNamesNodes.find(libName);
if ( tarIt == targetNamesNodes.end() ) if ( tarIt == targetNamesNodes.end() )
{ {
// We should not be here. // We should not be here.