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

Fix indentation in the code blocks generator.

This commit is contained in:
Stephen Kelly 2012-09-21 08:50:50 +02:00
parent 879fd354c1
commit f178d531a6
1 changed files with 41 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
Source/cmExtraCodeBlocksGenerator.cxx
View File

@ -633,59 +633,57 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
} }
} }
// the include directories for this target // the include directories for this target
std::set<std::string> uniqIncludeDirs; std::set<std::string> uniqIncludeDirs;
cmGeneratorTarget *gtgt = this->GlobalGenerator std::vector<std::string> includes;
->GetGeneratorTarget(target); target->GetMakefile()->GetLocalGenerator()->
std::vector<std::string> includes; GetIncludeDirectories(includes, gtgt);
target->GetMakefile()->GetLocalGenerator()-> for(std::vector<std::string>::const_iterator dirIt=includes.begin();
GetIncludeDirectories(includes, gtgt); dirIt != includes.end();
for(std::vector<std::string>::const_iterator dirIt=includes.begin(); ++dirIt)
dirIt != includes.end(); {
uniqIncludeDirs.insert(*dirIt);
}
std::string systemIncludeDirs = makefile->GetSafeDefinition(
"CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS");
if (!systemIncludeDirs.empty())
{
std::vector<std::string> dirs;
cmSystemTools::ExpandListArgument(systemIncludeDirs.c_str(), dirs);
for(std::vector<std::string>::const_iterator dirIt=dirs.begin();
dirIt != dirs.end();
++dirIt) ++dirIt)
{ {
uniqIncludeDirs.insert(*dirIt); uniqIncludeDirs.insert(*dirIt);
} }
}
std::string systemIncludeDirs = makefile->GetSafeDefinition( systemIncludeDirs = makefile->GetSafeDefinition(
"CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS"); "CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS");
if (!systemIncludeDirs.empty()) if (!systemIncludeDirs.empty())
{ {
std::vector<std::string> dirs; std::vector<std::string> dirs;
cmSystemTools::ExpandListArgument(systemIncludeDirs.c_str(), dirs); cmSystemTools::ExpandListArgument(systemIncludeDirs.c_str(), dirs);
for(std::vector<std::string>::const_iterator dirIt=dirs.begin(); for(std::vector<std::string>::const_iterator dirIt=dirs.begin();
dirIt != dirs.end(); dirIt != dirs.end();
++dirIt)
{
uniqIncludeDirs.insert(*dirIt);
}
}
systemIncludeDirs = makefile->GetSafeDefinition(
"CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS");
if (!systemIncludeDirs.empty())
{
std::vector<std::string> dirs;
cmSystemTools::ExpandListArgument(systemIncludeDirs.c_str(), dirs);
for(std::vector<std::string>::const_iterator dirIt=dirs.begin();
dirIt != dirs.end();
++dirIt)
{
uniqIncludeDirs.insert(*dirIt);
}
}
for(std::set<std::string>::const_iterator dirIt=uniqIncludeDirs.begin();
dirIt != uniqIncludeDirs.end();
++dirIt) ++dirIt)
{ {
fout <<" <Add directory=\"" << dirIt->c_str() << "\" />\n"; uniqIncludeDirs.insert(*dirIt);
} }
fout<<" </Compiler>\n";
} }
else // e.g. all and the GLOBAL and UTILITY targets
for(std::set<std::string>::const_iterator dirIt=uniqIncludeDirs.begin();
dirIt != uniqIncludeDirs.end();
++dirIt)
{
fout <<" <Add directory=\"" << dirIt->c_str() << "\" />\n";
}
fout<<" </Compiler>\n";
}
else // e.g. all and the GLOBAL and UTILITY targets
{ {
fout<<" <Option working_dir=\"" fout<<" <Option working_dir=\""
<< makefile->GetStartOutputDirectory() << "\" />\n" << makefile->GetStartOutputDirectory() << "\" />\n"