summaryrefslogtreecommitdiff
path: root/Source/cmExtraEclipseCDT4Generator.cxx
diff options
context:
space:
mode:
authorKitware Robot <kwrobot@kitware.com>2016-05-16 10:34:04 -0400
committerBrad King <brad.king@kitware.com>2016-05-16 16:05:19 -0400
commitd9fd2f5402eeaa345691313658e02b51038f570b (patch)
treedca71b9a7e267f4c6300da3eb770415381726785 /Source/cmExtraEclipseCDT4Generator.cxx
parent82df6deaafb36cbbfd450202bb20b320f637751a (diff)
downloadcmake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update all our C++ code to a new style defined by `.clang-format`. Use `clang-format` version 3.8. * If you reached this commit for a line in `git blame`, re-run the blame operation starting at the parent of this commit to see older history for the content. * See the parent commit for instructions to rebase a change across this style transition commit.
Diffstat (limited to 'Source/cmExtraEclipseCDT4Generator.cxx')
-rw-r--r--Source/cmExtraEclipseCDT4Generator.cxx912
1 files changed, 385 insertions, 527 deletions
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 2b20e954d1..a8f2e3f25e 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -34,7 +34,7 @@ static void AppendAttribute(cmXMLWriter& xml, const char* keyval)
xml.EndElement();
}
-template<typename T>
+template <typename T>
void AppendDictionary(cmXMLWriter& xml, const char* key, T const& value)
{
xml.StartElement("dictionary");
@@ -43,8 +43,8 @@ void AppendDictionary(cmXMLWriter& xml, const char* key, T const& value)
xml.EndElement();
}
-cmExtraEclipseCDT4Generator
-::cmExtraEclipseCDT4Generator() : cmExternalMakefileProjectGenerator()
+cmExtraEclipseCDT4Generator::cmExtraEclipseCDT4Generator()
+ : cmExternalMakefileProjectGenerator()
{
// TODO: Verify if __CYGWIN__ should be checked.
//#if defined(_WIN32) && !defined(__CYGWIN__)
@@ -64,36 +64,29 @@ cmExtraEclipseCDT4Generator
this->CXXEnabled = false;
}
-void cmExtraEclipseCDT4Generator
-::GetDocumentation(cmDocumentationEntry& entry, const std::string&) const
+void cmExtraEclipseCDT4Generator::GetDocumentation(cmDocumentationEntry& entry,
+ const std::string&) const
{
entry.Name = this->GetName();
entry.Brief = "Generates Eclipse CDT 4.0 project files.";
}
-void cmExtraEclipseCDT4Generator
-::EnableLanguage(std::vector<std::string> const& languages,
- cmMakefile *, bool)
+void cmExtraEclipseCDT4Generator::EnableLanguage(
+ std::vector<std::string> const& languages, cmMakefile*, bool)
{
for (std::vector<std::string>::const_iterator lit = languages.begin();
- lit != languages.end(); ++lit)
- {
- if (*lit == "CXX")
- {
+ lit != languages.end(); ++lit) {
+ if (*lit == "CXX") {
this->Natures.insert("org.eclipse.cdt.core.ccnature");
this->Natures.insert("org.eclipse.cdt.core.cnature");
this->CXXEnabled = true;
- }
- else if (*lit == "C")
- {
+ } else if (*lit == "C") {
this->Natures.insert("org.eclipse.cdt.core.cnature");
this->CEnabled = true;
- }
- else if (*lit == "Java")
- {
+ } else if (*lit == "Java") {
this->Natures.insert("org.eclipse.jdt.core.javanature");
- }
}
+ }
}
void cmExtraEclipseCDT4Generator::Generate()
@@ -103,66 +96,65 @@ void cmExtraEclipseCDT4Generator::Generate()
std::string eclipseVersion = mf->GetSafeDefinition("CMAKE_ECLIPSE_VERSION");
cmsys::RegularExpression regex(".*([0-9]+\\.[0-9]+).*");
- if (regex.find(eclipseVersion.c_str()))
- {
+ if (regex.find(eclipseVersion.c_str())) {
unsigned int majorVersion = 0;
unsigned int minorVersion = 0;
- int res=sscanf(regex.match(1).c_str(), "%u.%u", &majorVersion,
- &minorVersion);
- if (res == 2)
- {
+ int res =
+ sscanf(regex.match(1).c_str(), "%u.%u", &majorVersion, &minorVersion);
+ if (res == 2) {
int version = majorVersion * 1000 + minorVersion;
if (version < 3006) // 3.6 is Helios
- {
+ {
this->SupportsVirtualFolders = false;
this->SupportsMachO64Parser = false;
- }
+ }
if (version < 3007) // 3.7 is Indigo
- {
+ {
this->SupportsGmakeErrorParser = false;
- }
}
}
+ }
// TODO: Decide if these are local or member variables
- this->HomeDirectory = lg->GetSourceDirectory();
+ this->HomeDirectory = lg->GetSourceDirectory();
this->HomeOutputDirectory = lg->GetBinaryDirectory();
- this->GenerateLinkedResources = mf->IsOn(
- "CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES");
+ this->GenerateLinkedResources =
+ mf->IsOn("CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES");
- this->IsOutOfSourceBuild = (this->HomeDirectory!=this->HomeOutputDirectory);
+ this->IsOutOfSourceBuild =
+ (this->HomeDirectory != this->HomeOutputDirectory);
- this->GenerateSourceProject = (this->IsOutOfSourceBuild &&
- mf->IsOn("CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT"));
+ this->GenerateSourceProject =
+ (this->IsOutOfSourceBuild &&
+ mf->IsOn("CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT"));
- if ((this->GenerateSourceProject == false)
- && (mf->IsOn("ECLIPSE_CDT4_GENERATE_SOURCE_PROJECT")))
- {
- mf->IssueMessage(cmake::WARNING,
- "ECLIPSE_CDT4_GENERATE_SOURCE_PROJECT is set to TRUE, "
- "but this variable is not supported anymore since CMake 2.8.7.\n"
- "Enable CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT instead.");
- }
+ if ((this->GenerateSourceProject == false) &&
+ (mf->IsOn("ECLIPSE_CDT4_GENERATE_SOURCE_PROJECT"))) {
+ mf->IssueMessage(
+ cmake::WARNING,
+ "ECLIPSE_CDT4_GENERATE_SOURCE_PROJECT is set to TRUE, "
+ "but this variable is not supported anymore since CMake 2.8.7.\n"
+ "Enable CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT instead.");
+ }
if (cmSystemTools::IsSubDirectory(this->HomeOutputDirectory,
- this->HomeDirectory))
- {
- mf->IssueMessage(cmake::WARNING, "The build directory is a subdirectory "
+ this->HomeDirectory)) {
+ mf->IssueMessage(cmake::WARNING,
+ "The build directory is a subdirectory "
"of the source directory.\n"
"This is not supported well by Eclipse. It is strongly "
"recommended to use a build directory which is a "
"sibling of the source directory.");
- }
+ }
// NOTE: This is not good, since it pollutes the source tree. However,
// Eclipse doesn't allow CVS/SVN to work when the .project is not in
// the cvs/svn root directory. Hence, this is provided as an option.
- if (this->GenerateSourceProject)
- {
+ if (this->GenerateSourceProject) {
// create .project file in the source tree
this->CreateSourceProjectFile();
- }
+ }
// create a .project file
this->CreateProjectFile();
@@ -177,15 +169,15 @@ void cmExtraEclipseCDT4Generator::CreateSourceProjectFile()
// set up the project name: <project>-Source@<baseSourcePathName>
cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
- std::string name = this->GenerateProjectName(lg->GetProjectName(), "Source",
- this->GetPathBasename(this->HomeDirectory));
+ std::string name =
+ this->GenerateProjectName(lg->GetProjectName(), "Source",
+ this->GetPathBasename(this->HomeDirectory));
const std::string filename = this->HomeDirectory + "/.project";
cmGeneratedFileStream fout(filename.c_str());
- if (!fout)
- {
+ if (!fout) {
return;
- }
+ }
cmXMLWriter xml(fout);
xml.StartDocument("UTF-8");
@@ -197,18 +189,16 @@ void cmExtraEclipseCDT4Generator::CreateSourceProjectFile()
xml.Element("natures", "");
xml.StartElement("linkedResources");
- if (this->SupportsVirtualFolders)
- {
+ if (this->SupportsVirtualFolders) {
this->CreateLinksToSubprojects(xml, this->HomeDirectory);
this->SrcLinkedResources.clear();
- }
+ }
xml.EndElement(); // linkedResources
xml.EndElement(); // projectDescription
xml.EndDocument();
}
-
void cmExtraEclipseCDT4Generator::AddEnvVar(std::ostream& out,
const char* envVar,
cmLocalGenerator* lg)
@@ -222,56 +212,44 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(std::ostream& out,
std::string cacheEntryName = "CMAKE_ECLIPSE_ENVVAR_";
cacheEntryName += envVar;
- const char* cacheValue = lg->GetState()->GetInitializedCacheValue(
- cacheEntryName);
+ const char* cacheValue =
+ lg->GetState()->GetInitializedCacheValue(cacheEntryName);
// now we have both, decide which one to use
std::string valueToUse;
- if (envVarValue==0 && cacheValue==0)
- {
+ if (envVarValue == 0 && cacheValue == 0) {
// nothing known, do nothing
valueToUse = "";
- }
- else if (envVarValue!=0 && cacheValue==0)
- {
+ } else if (envVarValue != 0 && cacheValue == 0) {
// The variable is in the env, but not in the cache. Use it and put it
// in the cache
valueToUse = envVarValue;
mf->AddCacheDefinition(cacheEntryName, valueToUse.c_str(),
- cacheEntryName.c_str(), cmState::STRING,
- true);
+ cacheEntryName.c_str(), cmState::STRING, true);
mf->GetCMakeInstance()->SaveCache(lg->GetBinaryDirectory());
- }
- else if (envVarValue==0 && cacheValue!=0)
- {
+ } else if (envVarValue == 0 && cacheValue != 0) {
// It is already in the cache, but not in the env, so use it from the cache
valueToUse = cacheValue;
- }
- else
- {
+ } else {
// It is both in the cache and in the env.
// Use the version from the env. except if the value from the env is
// completely contained in the value from the cache (for the case that we
// now have a PATH without MSVC dirs in the env. but had the full PATH with
// all MSVC dirs during the cmake run which stored the var in the cache:
valueToUse = cacheValue;
- if (valueToUse.find(envVarValue) == std::string::npos)
- {
+ if (valueToUse.find(envVarValue) == std::string::npos) {
valueToUse = envVarValue;
mf->AddCacheDefinition(cacheEntryName, valueToUse.c_str(),
- cacheEntryName.c_str(), cmState::STRING,
- true);
+ cacheEntryName.c_str(), cmState::STRING, true);
mf->GetCMakeInstance()->SaveCache(lg->GetBinaryDirectory());
- }
}
+ }
- if (!valueToUse.empty())
- {
+ if (!valueToUse.empty()) {
out << envVar << "=" << valueToUse << "|";
- }
+ }
}
-
void cmExtraEclipseCDT4Generator::CreateProjectFile()
{
cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
@@ -280,25 +258,25 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
const std::string filename = this->HomeOutputDirectory + "/.project";
cmGeneratedFileStream fout(filename.c_str());
- if (!fout)
- {
+ if (!fout) {
return;
- }
+ }
std::string compilerId = mf->GetSafeDefinition("CMAKE_C_COMPILER_ID");
- if (compilerId.empty()) // no C compiler, try the C++ compiler:
- {
+ if (compilerId.empty()) // no C compiler, try the C++ compiler:
+ {
compilerId = mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID");
- }
+ }
cmXMLWriter xml(fout);
xml.StartDocument("UTF-8");
xml.StartElement("projectDescription");
- xml.Element("name", this->GenerateProjectName(lg->GetProjectName(),
- mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
- this->GetPathBasename(this->HomeOutputDirectory)));
+ xml.Element("name", this->GenerateProjectName(
+ lg->GetProjectName(),
+ mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
+ this->GetPathBasename(this->HomeOutputDirectory)));
xml.Element("comment", "");
xml.Element("projects", "");
@@ -312,43 +290,42 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
// use clean target
AppendDictionary(xml, "org.eclipse.cdt.make.core.cleanBuildTarget", "clean");
AppendDictionary(xml, "org.eclipse.cdt.make.core.enableCleanBuild", "true");
- AppendDictionary(xml, "org.eclipse.cdt.make.core.append_environment","true");
+ AppendDictionary(xml, "org.eclipse.cdt.make.core.append_environment",
+ "true");
AppendDictionary(xml, "org.eclipse.cdt.make.core.stopOnError", "true");
// set the make command
AppendDictionary(xml, "org.eclipse.cdt.make.core.enabledIncrementalBuild",
- "true");
- AppendDictionary(xml, "org.eclipse.cdt.make.core.build.command",
- this->GetEclipsePath(mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM")));
+ "true");
+ AppendDictionary(
+ xml, "org.eclipse.cdt.make.core.build.command",
+ this->GetEclipsePath(mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM")));
AppendDictionary(xml, "org.eclipse.cdt.make.core.contents",
- "org.eclipse.cdt.make.core.activeConfigSettings");
+ "org.eclipse.cdt.make.core.activeConfigSettings");
AppendDictionary(xml, "org.eclipse.cdt.make.core.build.target.inc", "all");
AppendDictionary(xml, "org.eclipse.cdt.make.core.build.arguments",
- mf->GetSafeDefinition("CMAKE_ECLIPSE_MAKE_ARGUMENTS"));
+ mf->GetSafeDefinition("CMAKE_ECLIPSE_MAKE_ARGUMENTS"));
AppendDictionary(xml, "org.eclipse.cdt.make.core.buildLocation",
- this->GetEclipsePath(this->HomeOutputDirectory));
- AppendDictionary(xml,
- "org.eclipse.cdt.make.core.useDefaultBuildCmd", "false");
+ this->GetEclipsePath(this->HomeOutputDirectory));
+ AppendDictionary(xml, "org.eclipse.cdt.make.core.useDefaultBuildCmd",
+ "false");
// set project specific environment
std::stringstream environment;
- environment << "VERBOSE=1|CMAKE_NO_VERBOSE=1|"; //verbose Makefile output
+ environment << "VERBOSE=1|CMAKE_NO_VERBOSE=1|"; // verbose Makefile output
// set vsvars32.bat environment available at CMake time,
// but not necessarily when eclipse is open
- if (compilerId == "MSVC")
- {
+ if (compilerId == "MSVC") {
AddEnvVar(environment, "PATH", lg);
AddEnvVar(environment, "INCLUDE", lg);
AddEnvVar(environment, "LIB", lg);
AddEnvVar(environment, "LIBPATH", lg);
- }
- else if (compilerId == "Intel")
- {
+ } else if (compilerId == "Intel") {
// if the env.var is set, use this one and put it in the cache
// if the env.var is not set, but the value is in the cache,
// use it from the cache:
AddEnvVar(environment, "INTEL_LICENSE_FILE", lg);
- }
+ }
AppendDictionary(xml, "org.eclipse.cdt.make.core.environment",
environment.str());
@@ -356,41 +333,33 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
AppendDictionary(xml, "org.eclipse.cdt.make.core.build.target.auto", "all");
AppendDictionary(xml, "org.eclipse.cdt.make.core.enableAutoBuild", "false");
AppendDictionary(xml, "org.eclipse.cdt.make.core.build.target.clean",
- "clean");
+ "clean");
AppendDictionary(xml, "org.eclipse.cdt.make.core.fullBuildTarget", "all");
AppendDictionary(xml, "org.eclipse.cdt.make.core.buildArguments", "");
AppendDictionary(xml, "org.eclipse.cdt.make.core.build.location",
- this->GetEclipsePath(this->HomeOutputDirectory));
+ this->GetEclipsePath(this->HomeOutputDirectory));
AppendDictionary(xml, "org.eclipse.cdt.make.core.autoBuildTarget", "all");
// set error parsers
std::stringstream errorOutputParser;
- if (compilerId == "MSVC")
- {
+ if (compilerId == "MSVC") {
errorOutputParser << "org.eclipse.cdt.core.VCErrorParser;";
- }
- else if (compilerId == "Intel")
- {
+ } else if (compilerId == "Intel") {
errorOutputParser << "org.eclipse.cdt.core.ICCErrorParser;";
- }
+ }
- if (this->SupportsGmakeErrorParser)
- {
+ if (this->SupportsGmakeErrorParser) {
errorOutputParser << "org.eclipse.cdt.core.GmakeErrorParser;";
- }
- else
- {
+ } else {
errorOutputParser << "org.eclipse.cdt.core.MakeErrorParser;";
- }
+ }
- errorOutputParser <<
- "org.eclipse.cdt.core.GCCErrorParser;"
- "org.eclipse.cdt.core.GASErrorParser;"
- "org.eclipse.cdt.core.GLDErrorParser;"
- ;
+ errorOutputParser << "org.eclipse.cdt.core.GCCErrorParser;"
+ "org.eclipse.cdt.core.GASErrorParser;"
+ "org.eclipse.cdt.core.GLDErrorParser;";
AppendDictionary(xml, "org.eclipse.cdt.core.errorOutputParser",
- errorOutputParser.str());
+ errorOutputParser.str());
xml.EndElement(); // arguments
xml.EndElement(); // buildCommand
@@ -404,32 +373,29 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
// set natures for c/c++ projects
xml.StartElement("natures");
xml.Element("nature", "org.eclipse.cdt.make.core.makeNature");
- xml.Element("nature", "org.eclipse.cdt.make.core.ScannerConfigNature");;
+ xml.Element("nature", "org.eclipse.cdt.make.core.ScannerConfigNature");
+ ;
- for (std::set<std::string>::const_iterator nit=this->Natures.begin();
- nit != this->Natures.end(); ++nit)
- {
+ for (std::set<std::string>::const_iterator nit = this->Natures.begin();
+ nit != this->Natures.end(); ++nit) {
xml.Element("nature", *nit);
- }
+ }
- if (const char *extraNaturesProp = mf->GetState()
- ->GetGlobalProperty("ECLIPSE_EXTRA_NATURES"))
- {
+ if (const char* extraNaturesProp =
+ mf->GetState()->GetGlobalProperty("ECLIPSE_EXTRA_NATURES")) {
std::vector<std::string> extraNatures;
cmSystemTools::ExpandListArgument(extraNaturesProp, extraNatures);
for (std::vector<std::string>::const_iterator nit = extraNatures.begin();
- nit != extraNatures.end(); ++nit)
- {
+ nit != extraNatures.end(); ++nit) {
xml.Element("nature", *nit);
- }
}
+ }
xml.EndElement(); // natures
xml.StartElement("linkedResources");
// create linked resources
- if (this->IsOutOfSourceBuild)
- {
+ if (this->IsOutOfSourceBuild) {
// create a linked resource to CMAKE_SOURCE_DIR
// (this is not done anymore for each project because of
// http://public.kitware.com/Bug/view.php?id=9978 and because I found it
@@ -437,73 +403,65 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
// projects, Alex
std::string sourceLinkedResourceName = "[Source directory]";
- std::string linkSourceDirectory = this->GetEclipsePath(
- lg->GetCurrentSourceDirectory());
+ std::string linkSourceDirectory =
+ this->GetEclipsePath(lg->GetCurrentSourceDirectory());
// .project dir can't be subdir of a linked resource dir
if (!cmSystemTools::IsSubDirectory(this->HomeOutputDirectory,
- linkSourceDirectory))
- {
+ linkSourceDirectory)) {
this->AppendLinkedResource(xml, sourceLinkedResourceName,
this->GetEclipsePath(linkSourceDirectory),
LinkToFolder);
this->SrcLinkedResources.push_back(sourceLinkedResourceName);
- }
-
}
+ }
- if (this->SupportsVirtualFolders)
- {
+ if (this->SupportsVirtualFolders) {
this->CreateLinksToSubprojects(xml, this->HomeOutputDirectory);
this->CreateLinksForTargets(xml);
- }
+ }
xml.EndElement(); // linkedResources
xml.EndElement(); // projectDescription
}
void cmExtraEclipseCDT4Generator::WriteGroups(
- std::vector<cmSourceGroup> const& sourceGroups,
- std::string& linkName, cmXMLWriter& xml)
+ std::vector<cmSourceGroup> const& sourceGroups, std::string& linkName,
+ cmXMLWriter& xml)
{
- for(std::vector<cmSourceGroup>::const_iterator sgIt = sourceGroups.begin();
- sgIt != sourceGroups.end(); ++sgIt)
- {
+ for (std::vector<cmSourceGroup>::const_iterator sgIt = sourceGroups.begin();
+ sgIt != sourceGroups.end(); ++sgIt) {
std::string linkName3 = linkName;
linkName3 += "/";
linkName3 += sgIt->GetFullName();
size_t pos = 0;
- while ((pos = linkName3.find("\\", pos)) != std::string::npos)
- {
+ while ((pos = linkName3.find("\\", pos)) != std::string::npos) {
linkName3.replace(pos, 1, "/");
pos++;
- }
+ }
this->AppendLinkedResource(xml, linkName3, "virtual:/virtual",
VirtualFolder);
std::vector<cmSourceGroup> const& children = sgIt->GetGroupChildren();
- if (!children.empty())
- {
+ if (!children.empty()) {
this->WriteGroups(children, linkName, xml);
- }
+ }
std::vector<const cmSourceFile*> sFiles = sgIt->GetSourceFiles();
- for(std::vector<const cmSourceFile*>::const_iterator
- fileIt = sFiles.begin(); fileIt != sFiles.end(); ++fileIt)
- {
+ for (std::vector<const cmSourceFile*>::const_iterator fileIt =
+ sFiles.begin();
+ fileIt != sFiles.end(); ++fileIt) {
std::string fullPath = (*fileIt)->GetFullPath();
- if (!cmSystemTools::FileIsDirectory(fullPath))
- {
+ if (!cmSystemTools::FileIsDirectory(fullPath)) {
std::string linkName4 = linkName3;
linkName4 += "/";
linkName4 += cmSystemTools::GetFilenameName(fullPath);
this->AppendLinkedResource(xml, linkName4,
- this->GetEclipsePath(fullPath),
- LinkToFile);
- }
+ this->GetEclipsePath(fullPath), LinkToFile);
}
}
+ }
}
void cmExtraEclipseCDT4Generator::CreateLinksForTargets(cmXMLWriter& xml)
@@ -511,141 +469,119 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(cmXMLWriter& xml)
std::string linkName = "[Targets]";
this->AppendLinkedResource(xml, linkName, "virtual:/virtual", VirtualFolder);
- for (std::vector<cmLocalGenerator*>::const_iterator
- lgIt = this->GlobalGenerator->GetLocalGenerators().begin();
- lgIt != this->GlobalGenerator->GetLocalGenerators().end();
- ++lgIt)
- {
+ for (std::vector<cmLocalGenerator*>::const_iterator lgIt =
+ this->GlobalGenerator->GetLocalGenerators().begin();
+ lgIt != this->GlobalGenerator->GetLocalGenerators().end(); ++lgIt) {
cmMakefile* makefile = (*lgIt)->GetMakefile();
const std::vector<cmGeneratorTarget*> targets =
- (*lgIt)->GetGeneratorTargets();
+ (*lgIt)->GetGeneratorTargets();
- for(std::vector<cmGeneratorTarget*>::const_iterator ti=targets.begin();
- ti!=targets.end();++ti)
- {
+ for (std::vector<cmGeneratorTarget*>::const_iterator ti = targets.begin();
+ ti != targets.end(); ++ti) {
std::string linkName2 = linkName;
linkName2 += "/";
- switch((*ti)->GetType())
- {
+ switch ((*ti)->GetType()) {
case cmState::EXECUTABLE:
case cmState::STATIC_LIBRARY:
case cmState::SHARED_LIBRARY:
case cmState::MODULE_LIBRARY:
- case cmState::OBJECT_LIBRARY:
- {
- const char* prefix = ((*ti)->GetType()==cmState::EXECUTABLE ?
- "[exe] " : "[lib] ");
+ case cmState::OBJECT_LIBRARY: {
+ const char* prefix =
+ ((*ti)->GetType() == cmState::EXECUTABLE ? "[exe] " : "[lib] ");
linkName2 += prefix;
linkName2 += (*ti)->GetName();
this->AppendLinkedResource(xml, linkName2, "virtual:/virtual",
VirtualFolder);
- if (!this->GenerateLinkedResources)
- {
+ if (!this->GenerateLinkedResources) {
break; // skip generating the linked resources to the source files
- }
- std::vector<cmSourceGroup> sourceGroups=makefile->GetSourceGroups();
+ }
+ std::vector<cmSourceGroup> sourceGroups =
+ makefile->GetSourceGroups();
// get the files from the source lists then add them to the groups
cmGeneratorTarget* gt = const_cast<cmGeneratorTarget*>(*ti);
std::vector<cmSourceFile*> files;
gt->GetSourceFiles(files,
- makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
- for(std::vector<cmSourceFile*>::const_iterator sfIt = files.begin();
- sfIt != files.end();
- sfIt++)
- {
+ makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
+ for (std::vector<cmSourceFile*>::const_iterator sfIt = files.begin();
+ sfIt != files.end(); sfIt++) {
// Add the file to the list of sources.
std::string source = (*sfIt)->GetFullPath();
cmSourceGroup* sourceGroup =
- makefile->FindSourceGroup(source.c_str(), sourceGroups);
+ makefile->FindSourceGroup(source.c_str(), sourceGroups);
sourceGroup->AssignSource(*sfIt);
- }
+ }
this->WriteGroups(sourceGroups, linkName2, xml);
- }
- break;
+ } break;
// ignore all others:
default:
break;
- }
}
}
+ }
}
-
void cmExtraEclipseCDT4Generator::CreateLinksToSubprojects(
- cmXMLWriter& xml, const std::string& baseDir)
+ cmXMLWriter& xml, const std::string& baseDir)
{
- if (!this->GenerateLinkedResources)
- {
+ if (!this->GenerateLinkedResources) {
return;
- }
+ }
// for each sub project create a linked resource to the source dir
// - only if it is an out-of-source build
- this->AppendLinkedResource(xml, "[Subprojects]",
- "virtual:/virtual", VirtualFolder);
+ this->AppendLinkedResource(xml, "[Subprojects]", "virtual:/virtual",
+ VirtualFolder);
for (std::map<std::string, std::vector<cmLocalGenerator*> >::const_iterator
- it = this->GlobalGenerator->GetProjectMap().begin();
- it != this->GlobalGenerator->GetProjectMap().end();
- ++it)
- {
- std::string linkSourceDirectory = this->GetEclipsePath(
- it->second[0]->GetCurrentSourceDirectory());
+ it = this->GlobalGenerator->GetProjectMap().begin();
+ it != this->GlobalGenerator->GetProjectMap().end(); ++it) {
+ std::string linkSourceDirectory =
+ this->GetEclipsePath(it->second[0]->GetCurrentSourceDirectory());
// a linked resource must not point to a parent directory of .project or
// .project itself
if ((baseDir != linkSourceDirectory) &&
- !cmSystemTools::IsSubDirectory(baseDir,
- linkSourceDirectory))
- {
+ !cmSystemTools::IsSubDirectory(baseDir, linkSourceDirectory)) {
std::string linkName = "[Subprojects]/";
linkName += it->first;
this->AppendLinkedResource(xml, linkName,
this->GetEclipsePath(linkSourceDirectory),
- LinkToFolder
- );
+ LinkToFolder);
// Don't add it to the srcLinkedResources, because listing multiple
// directories confuses the Eclipse indexer (#13596).
- }
}
+ }
}
-
void cmExtraEclipseCDT4Generator::AppendIncludeDirectories(
- cmXMLWriter& xml,
- const std::vector<std::string>& includeDirs,
- std::set<std::string>& emittedDirs)
+ cmXMLWriter& xml, const std::vector<std::string>& includeDirs,
+ std::set<std::string>& emittedDirs)
{
- for(std::vector<std::string>::const_iterator inc = includeDirs.begin();
- inc != includeDirs.end();
- ++inc)
- {
- if (!inc->empty())
- {
+ for (std::vector<std::string>::const_iterator inc = includeDirs.begin();
+ inc != includeDirs.end(); ++inc) {
+ if (!inc->empty()) {
std::string dir = cmSystemTools::CollapseFullPath(*inc);
// handle framework include dirs on OSX, the remainder after the
// Frameworks/ part has to be stripped
// /System/Library/Frameworks/GLUT.framework/Headers
cmsys::RegularExpression frameworkRx("(.+/Frameworks)/.+\\.framework/");
- if(frameworkRx.find(dir.c_str()))
- {
+ if (frameworkRx.find(dir.c_str())) {
dir = frameworkRx.match(1);
- }
+ }
- if(emittedDirs.find(dir) == emittedDirs.end())
- {
+ if (emittedDirs.find(dir) == emittedDirs.end()) {
emittedDirs.insert(dir);
xml.StartElement("pathentry");
xml.Attribute("include",
- cmExtraEclipseCDT4Generator::GetEclipsePath(dir));
+ cmExtraEclipseCDT4Generator::GetEclipsePath(dir));
xml.Attribute("kind", "inc");
xml.Attribute("path", "");
xml.Attribute("system", "true");
xml.EndElement();
- }
}
}
+ }
}
void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
@@ -658,10 +594,9 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
const std::string filename = this->HomeOutputDirectory + "/.cproject";
cmGeneratedFileStream fout(filename.c_str());
- if (!fout)
- {
+ if (!fout) {
return;
- }
+ }
cmXMLWriter xml(fout);
@@ -678,7 +613,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
// Configuration settings...
xml.StartElement("storageModule");
xml.Attribute("buildSystemId",
- "org.eclipse.cdt.core.defaultConfigDataProvider");
+ "org.eclipse.cdt.core.defaultConfigDataProvider");
xml.Attribute("id", "org.eclipse.cdt.core.default.config.1");
xml.Attribute("moduleId", "org.eclipse.cdt.core.settings");
xml.Attribute("name", "Configuration");
@@ -686,10 +621,9 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
xml.StartElement("extensions");
// TODO: refactor this out...
- std::string executableFormat = mf->GetSafeDefinition(
- "CMAKE_EXECUTABLE_FORMAT");
- if (executableFormat == "ELF")
- {
+ std::string executableFormat =
+ mf->GetSafeDefinition("CMAKE_EXECUTABLE_FORMAT");
+ if (executableFormat == "ELF") {
xml.StartElement("extension");
xml.Attribute("id", "org.eclipse.cdt.core.ELF");
xml.Attribute("point", "org.eclipse.cdt.core.BinaryParser");
@@ -701,12 +635,9 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
AppendAttribute(xml, "addr2line");
AppendAttribute(xml, "c++filt");
xml.EndElement(); // extension
- }
- else
- {
+ } else {
std::string systemName = mf->GetSafeDefinition("CMAKE_SYSTEM_NAME");
- if (systemName == "CYGWIN")
- {
+ if (systemName == "CYGWIN") {
xml.StartElement("extension");
xml.Attribute("id", "org.eclipse.cdt.core.Cygwin_PE");
xml.Attribute("point", "org.eclipse.cdt.core.BinaryParser");
@@ -715,29 +646,24 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
AppendAttribute(xml, "cygpath");
AppendAttribute(xml, "nm");
xml.EndElement(); // extension
- }
- else if (systemName == "Windows")
- {
+ } else if (systemName == "Windows") {
xml.StartElement("extension");
xml.Attribute("id", "org.eclipse.cdt.core.PE");
xml.Attribute("point", "org.eclipse.cdt.core.BinaryParser");
xml.EndElement(); // extension
- }
- else if (systemName == "Darwin")
- {
+ } else if (systemName == "Darwin") {
xml.StartElement("extension");
- xml.Attribute("id", this->SupportsMachO64Parser ?
- "org.eclipse.cdt.core.MachO64" : "org.eclipse.cdt.core.MachO");
+ xml.Attribute("id", this->SupportsMachO64Parser
+ ? "org.eclipse.cdt.core.MachO64"
+ : "org.eclipse.cdt.core.MachO");
xml.Attribute("point", "org.eclipse.cdt.core.BinaryParser");
AppendAttribute(xml, "c++filt");
xml.EndElement(); // extension
- }
- else
- {
+ } else {
// *** Should never get here ***
xml.Element("error_toolchain_type");
- }
}
+ }
xml.EndElement(); // extensions
xml.EndElement(); // storageModule
@@ -761,24 +687,23 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
// - make it type 'src'
// - and exclude it from type 'out'
std::string excludeFromOut;
-/* I don't know what the pathentry kind="src" are good for, e.g. autocompletion
- * works also without them. Done wrong, the indexer complains, see #12417
- * and #12213.
- * According to #13596, this entry at least limits the directories the
- * indexer is searching for files. So now the "src" entry contains only
- * the linked resource to CMAKE_SOURCE_DIR.
- * The CDT documentation is very terse on that:
- * "CDT_SOURCE: Entry kind constant describing a path entry identifying a
- * folder containing source code to be compiled."
- * Also on the cdt-dev list didn't bring any information:
- * http://web.archiveorange.com/archive/v/B4NlJDNIpYoOS1SbxFNy
- * Alex */
-
- for (std::vector<std::string>::const_iterator
- it = this->SrcLinkedResources.begin();
- it != this->SrcLinkedResources.end();
- ++it)
- {
+ /* I don't know what the pathentry kind="src" are good for, e.g.
+ * autocompletion
+ * works also without them. Done wrong, the indexer complains, see #12417
+ * and #12213.
+ * According to #13596, this entry at least limits the directories the
+ * indexer is searching for files. So now the "src" entry contains only
+ * the linked resource to CMAKE_SOURCE_DIR.
+ * The CDT documentation is very terse on that:
+ * "CDT_SOURCE: Entry kind constant describing a path entry identifying a
+ * folder containing source code to be compiled."
+ * Also on the cdt-dev list didn't bring any information:
+ * http://web.archiveorange.com/archive/v/B4NlJDNIpYoOS1SbxFNy
+ * Alex */
+
+ for (std::vector<std::string>::const_iterator it =
+ this->SrcLinkedResources.begin();
+ it != this->SrcLinkedResources.end(); ++it) {
xml.StartElement("pathentry");
xml.Attribute("kind", "src");
xml.Attribute("path", *it);
@@ -787,11 +712,10 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
// exlude source directory from output search path
// - only if not named the same as an output directory
if (!cmSystemTools::FileIsDirectory(
- std::string(this->HomeOutputDirectory + "/" + *it)))
- {
+ std::string(this->HomeOutputDirectory + "/" + *it))) {
excludeFromOut += *it + "/|";
- }
}
+ }
excludeFromOut += "**/CMakeFiles/";
@@ -803,47 +727,38 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
// add pre-processor definitions to allow eclipse to gray out sections
emmited.clear();
- for (std::vector<cmLocalGenerator*>::const_iterator
- it = this->GlobalGenerator->GetLocalGenerators().begin();
- it != this->GlobalGenerator->GetLocalGenerators().end();
- ++it)
- {
-
- if(const char* cdefs = (*it)->GetMakefile()->GetProperty(
- "COMPILE_DEFINITIONS"))
- {
+ for (std::vector<cmLocalGenerator*>::const_iterator it =
+ this->GlobalGenerator->GetLocalGenerators().begin();
+ it != this->GlobalGenerator->GetLocalGenerators().end(); ++it) {
+
+ if (const char* cdefs =
+ (*it)->GetMakefile()->GetProperty("COMPILE_DEFINITIONS")) {
// Expand the list.
std::vector<std::string> defs;
cmGeneratorExpression::Split(cdefs, defs);
- for(std::vector<std::string>::const_iterator di = defs.begin();
- di != defs.end(); ++di)
- {
- if (cmGeneratorExpression::Find(*di) != std::string::npos)
- {
+ for (std::vector<std::string>::const_iterator di = defs.begin();
+ di != defs.end(); ++di) {
+ if (cmGeneratorExpression::Find(*di) != std::string::npos) {
continue;
- }
+ }
std::string::size_type equals = di->find('=', 0);
std::string::size_type enddef = di->length();
std::string def;
std::string val;
- if (equals != std::string::npos && equals < enddef)
- {
+ if (equals != std::string::npos && equals < enddef) {
// we have -DFOO=BAR
def = di->substr(0, equals);
val = di->substr(equals + 1, enddef - equals + 1);
- }
- else
- {
+ } else {
// we have -DFOO
def = *di;
- }
+ }
// insert the definition if not already added.
- if(emmited.find(def) == emmited.end())
- {
+ if (emmited.find(def) == emmited.end()) {
emmited.insert(def);
xml.StartElement("pathentry");
xml.Attribute("kind", "mac");
@@ -851,37 +766,32 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
xml.Attribute("path", "");
xml.Attribute("value", val);
xml.EndElement();
- }
}
}
}
+ }
// add system defined c macros
- const char* cDefs=mf->GetDefinition(
- "CMAKE_EXTRA_GENERATOR_C_SYSTEM_DEFINED_MACROS");
- if(this->CEnabled && cDefs)
- {
+ const char* cDefs =
+ mf->GetDefinition("CMAKE_EXTRA_GENERATOR_C_SYSTEM_DEFINED_MACROS");
+ if (this->CEnabled && cDefs) {
// Expand the list.
std::vector<std::string> defs;
cmSystemTools::ExpandListArgument(cDefs, defs, true);
// the list must contain only definition-value pairs:
- if ((defs.size() % 2) == 0)
- {
+ if ((defs.size() % 2) == 0) {
std::vector<std::string>::const_iterator di = defs.begin();
- while (di != defs.end())
- {
+ while (di != defs.end()) {
std::string def = *di;
++di;
std::string val;
- if (di != defs.end())
- {
+ if (di != defs.end()) {
val = *di;
++di;
- }
+ }
// insert the definition if not already added.
- if(emmited.find(def) == emmited.end())
- {
+ if (emmited.find(def) == emmited.end()) {
emmited.insert(def);
xml.StartElement("pathentry");
xml.Attribute("kind", "mac");
@@ -889,37 +799,32 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
xml.Attribute("path", "");
xml.Attribute("value", val);
xml.EndElement();
- }
}
}
}
+ }
// add system defined c++ macros
- const char* cxxDefs = mf->GetDefinition(
- "CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS");
- if(this->CXXEnabled && cxxDefs)
- {
+ const char* cxxDefs =
+ mf->GetDefinition("CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS");
+ if (this->CXXEnabled && cxxDefs) {
// Expand the list.
std::vector<std::string> defs;
cmSystemTools::ExpandListArgument(cxxDefs, defs, true);
// the list must contain only definition-value pairs:
- if ((defs.size() % 2) == 0)
- {
+ if ((defs.size() % 2) == 0) {
std::vector<std::string>::const_iterator di = defs.begin();
- while (di != defs.end())
- {
+ while (di != defs.end()) {
std::string def = *di;
++di;
std::string val;
- if (di != defs.end())
- {
+ if (di != defs.end()) {
val = *di;
++di;
- }
+ }
// insert the definition if not already added.
- if(emmited.find(def) == emmited.end())
- {
+ if (emmited.find(def) == emmited.end()) {
emmited.insert(def);
xml.StartElement("pathentry");
xml.Attribute("kind", "mac");
@@ -927,49 +832,44 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
xml.Attribute("path", "");
xml.Attribute("value", val);
xml.EndElement();
- }
}
}
}
+ }
// include dirs
emmited.clear();
- for (std::vector<cmLocalGenerator*>::const_iterator
- it = this->GlobalGenerator->GetLocalGenerators().begin();
- it != this->GlobalGenerator->GetLocalGenerators().end();
- ++it)
- {
+ for (std::vector<cmLocalGenerator*>::const_iterator it =
+ this->GlobalGenerator->GetLocalGenerators().begin();
+ it != this->GlobalGenerator->GetLocalGenerators().end(); ++it) {
std::vector<cmGeneratorTarget*> targets = (*it)->GetGeneratorTargets();
for (std::vector<cmGeneratorTarget*>::iterator l = targets.begin();
- l != targets.end(); ++l)
- {
+ l != targets.end(); ++l) {
std::vector<std::string> includeDirs;
std::string config = mf->GetSafeDefinition("CMAKE_BUILD_TYPE");
(*it)->GetIncludeDirectories(includeDirs, *l, "C", config);
this->AppendIncludeDirectories(xml, includeDirs, emmited);
- }
}
+ }
// now also the system include directories, in case we found them in
// CMakeSystemSpecificInformation.cmake. This makes Eclipse find the
// standard headers.
std::string compiler = mf->GetSafeDefinition("CMAKE_C_COMPILER");
- if (this->CEnabled && !compiler.empty())
- {
- std::string systemIncludeDirs = mf->GetSafeDefinition(
- "CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS");
+ if (this->CEnabled && !compiler.empty()) {
+ std::string systemIncludeDirs =
+ mf->GetSafeDefinition("CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS");
std::vector<std::string> dirs;
cmSystemTools::ExpandListArgument(systemIncludeDirs, dirs);
this->AppendIncludeDirectories(xml, dirs, emmited);
- }
+ }
compiler = mf->GetSafeDefinition("CMAKE_CXX_COMPILER");
- if (this->CXXEnabled && !compiler.empty())
- {
- std::string systemIncludeDirs = mf->GetSafeDefinition(
- "CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS");
+ if (this->CXXEnabled && !compiler.empty()) {
+ std::string systemIncludeDirs =
+ mf->GetSafeDefinition("CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS");
std::vector<std::string> dirs;
cmSystemTools::ExpandListArgument(systemIncludeDirs, dirs);
this->AppendIncludeDirectories(xml, dirs, emmited);
- }
+ }
xml.EndElement(); // storageModule
@@ -979,141 +879,124 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
xml.StartElement("buildTargets");
emmited.clear();
const std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
- const std::string makeArgs = mf->GetSafeDefinition(
- "CMAKE_ECLIPSE_MAKE_ARGUMENTS");
+ const std::string makeArgs =
+ mf->GetSafeDefinition("CMAKE_ECLIPSE_MAKE_ARGUMENTS");
- cmGlobalGenerator* generator
- = const_cast<cmGlobalGenerator*>(this->GlobalGenerator);
+ cmGlobalGenerator* generator =
+ const_cast<cmGlobalGenerator*>(this->GlobalGenerator);
std::string allTarget;
std::string cleanTarget;
- if (generator->GetAllTargetName())
- {
+ if (generator->GetAllTargetName()) {
allTarget = generator->GetAllTargetName();
- }
- if (generator->GetCleanTargetName())
- {
+ }
+ if (generator->GetCleanTargetName()) {
cleanTarget = generator->GetCleanTargetName();
- }
+ }
// add all executable and library targets and some of the GLOBAL
// and UTILITY targets
- for (std::vector<cmLocalGenerator*>::const_iterator
- it = this->GlobalGenerator->GetLocalGenerators().begin();
- it != this->GlobalGenerator->GetLocalGenerators().end();
- ++it)
- {
+ for (std::vector<cmLocalGenerator*>::const_iterator it =
+ this->GlobalGenerator->GetLocalGenerators().begin();
+ it != this->GlobalGenerator->GetLocalGenerators().end(); ++it) {
const std::vector<cmGeneratorTarget*> targets =
- (*it)->GetGeneratorTargets();
+ (*it)->GetGeneratorTargets();
std::string subdir = (*it)->Convert((*it)->GetCurrentBinaryDirectory(),
- cmLocalGenerator::HOME_OUTPUT);
- if (subdir == ".")
- {
+ cmLocalGenerator::HOME_OUTPUT);
+ if (subdir == ".") {
subdir = "";
- }
+ }
- for(std::vector<cmGeneratorTarget*>::const_iterator ti =
- targets.begin(); ti!=targets.end(); ++ti)
- {
+ for (std::vector<cmGeneratorTarget*>::const_iterator ti = targets.begin();
+ ti != targets.end(); ++ti) {
std::string targetName = (*ti)->GetName();
- switch((*ti)->GetType())
- {
- case cmState::GLOBAL_TARGET:
- {
+ switch ((*ti)->GetType()) {
+ case cmState::GLOBAL_TARGET: {
// Only add the global targets from CMAKE_BINARY_DIR,
// not from the subdirs
- if (subdir.empty())
- {
- this->AppendTarget(xml, targetName, make, makeArgs, subdir, ": ");
- }
- }
- break;
- case cmState::UTILITY:
- // Add all utility targets, except the Nightly/Continuous/
- // Experimental-"sub"targets as e.g. NightlyStart
- if (((targetName.find("Nightly")==0) &&(targetName!="Nightly"))
- || ((targetName.find("Continuous")==0)&&(targetName!="Continuous"))
- || ((targetName.find("Experimental")==0)
- && (targetName!="Experimental")))
- {
- break;
- }
-
- this->AppendTarget(xml, targetName, make, makeArgs, subdir, ": ");
- break;
- case cmState::EXECUTABLE:
- case cmState::STATIC_LIBRARY:
- case cmState::SHARED_LIBRARY:
- case cmState::MODULE_LIBRARY:
- case cmState::OBJECT_LIBRARY:
- {
- const char* prefix = ((*ti)->GetType()==cmState::EXECUTABLE ?
- "[exe] " : "[lib] ");
- this->AppendTarget(xml, targetName, make, makeArgs, subdir, prefix);
- std::string fastTarget = targetName;
- fastTarget += "/fast";
- this->AppendTarget(xml, fastTarget, make, makeArgs, subdir, prefix);
-
- // Add Build and Clean targets in the virtual folder of targets:
- if (this->SupportsVirtualFolders)
- {
- std::string virtDir = "[Targets]/";
- virtDir += prefix;
- virtDir += targetName;
- std::string buildArgs = "-C \"";
- buildArgs += (*it)->GetBinaryDirectory();
- buildArgs += "\" ";
- buildArgs += makeArgs;
- this->AppendTarget(xml, "Build", make, buildArgs, virtDir, "",
- targetName.c_str());
-
- std::string cleanArgs = "-E chdir \"";
- cleanArgs += (*it)->GetCurrentBinaryDirectory();
- cleanArgs += "\" \"";
- cleanArgs += cmSystemTools::GetCMakeCommand();
- cleanArgs += "\" -P \"";
- cmGeneratorTarget* gt = *ti;
- cleanArgs += (*it)->GetTargetDirectory(gt);
- cleanArgs += "/cmake_clean.cmake\"";
- this->AppendTarget(xml, "Clean", cmSystemTools::GetCMakeCommand(),
- cleanArgs, virtDir, "", "");
+ if (subdir.empty()) {
+ this->AppendTarget(xml, targetName, make, makeArgs, subdir, ": ");
}
- }
- break;
+ } break;
+ case cmState::UTILITY:
+ // Add all utility targets, except the Nightly/Continuous/
+ // Experimental-"sub"targets as e.g. NightlyStart
+ if (((targetName.find("Nightly") == 0) &&
+ (targetName != "Nightly")) ||
+ ((targetName.find("Continuous") == 0) &&
+ (targetName != "Continuous")) ||
+ ((targetName.find("Experimental") == 0) &&
+ (targetName != "Experimental"))) {
+ break;
+ }
+
+ this->AppendTarget(xml, targetName, make, makeArgs, subdir, ": ");
+ break;
+ case cmState::EXECUTABLE:
+ case cmState::STATIC_LIBRARY:
+ case cmState::SHARED_LIBRARY:
+ case cmState::MODULE_LIBRARY:
+ case cmState::OBJECT_LIBRARY: {
+ const char* prefix =
+ ((*ti)->GetType() == cmState::EXECUTABLE ? "[exe] " : "[lib] ");
+ this->AppendTarget(xml, targetName, make, makeArgs, subdir, prefix);
+ std::string fastTarget = targetName;
+ fastTarget += "/fast";
+ this->AppendTarget(xml, fastTarget, make, makeArgs, subdir, prefix);
+
+ // Add Build and Clean targets in the virtual folder of targets:
+ if (this->SupportsVirtualFolders) {
+ std::string virtDir = "[Targets]/";
+ virtDir += prefix;
+ virtDir += targetName;
+ std::string buildArgs = "-C \"";
+ buildArgs += (*it)->GetBinaryDirectory();
+ buildArgs += "\" ";
+ buildArgs += makeArgs;
+ this->AppendTarget(xml, "Build", make, buildArgs, virtDir, "",
+ targetName.c_str());
+
+ std::string cleanArgs = "-E chdir \"";
+ cleanArgs += (*it)->GetCurrentBinaryDirectory();
+ cleanArgs += "\" \"";
+ cleanArgs += cmSystemTools::GetCMakeCommand();
+ cleanArgs += "\" -P \"";
+ cmGeneratorTarget* gt = *ti;
+ cleanArgs += (*it)->GetTargetDirectory(gt);
+ cleanArgs += "/cmake_clean.cmake\"";
+ this->AppendTarget(xml, "Clean", cmSystemTools::GetCMakeCommand(),
+ cleanArgs, virtDir, "", "");
+ }
+ } break;
default:
break;
- }
}
+ }
// insert the all and clean targets in every subdir
- if (!allTarget.empty())
- {
+ if (!allTarget.empty()) {
this->AppendTarget(xml, allTarget, make, makeArgs, subdir, ": ");
- }
- if (!cleanTarget.empty())
- {
+ }
+ if (!cleanTarget.empty()) {
this->AppendTarget(xml, cleanTarget, make, makeArgs, subdir, ": ");
- }
+ }
- //insert rules for compiling, preprocessing and assembling individual files
+ // insert rules for compiling, preprocessing and assembling individual
+ // files
std::vector<std::string> objectFileTargets;
(*it)->GetIndividualFileTargets(objectFileTargets);
- for(std::vector<std::string>::const_iterator fit=objectFileTargets.begin();
- fit != objectFileTargets.end();
- ++fit)
- {
+ for (std::vector<std::string>::const_iterator fit =
+ objectFileTargets.begin();
+ fit != objectFileTargets.end(); ++fit) {
const char* prefix = "[obj] ";
- if ((*fit)[fit->length()-1] == 's')
- {
+ if ((*fit)[fit->length() - 1] == 's') {
prefix = "[to asm] ";
- }
- else if ((*fit)[fit->length()-1] == 'i')
- {
+ } else if ((*fit)[fit->length() - 1] == 'i') {
prefix = "[pre] ";
- }
- this->AppendTarget(xml, *fit, make, makeArgs, subdir, prefix);
}
+ this->AppendTarget(xml, *fit, make, makeArgs, subdir, prefix);
}
+ }
xml.EndElement(); // buildTargets
xml.EndElement(); // storageModule
@@ -1136,80 +1019,70 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
xml.EndElement(); // cproject
}
-std::string
-cmExtraEclipseCDT4Generator::GetEclipsePath(const std::string& path)
+std::string cmExtraEclipseCDT4Generator::GetEclipsePath(
+ const std::string& path)
{
#if defined(__CYGWIN__)
std::string cmd = "cygpath -m " + path;
std::string out;
- if (!cmSystemTools::RunSingleCommand(cmd.c_str(), &out, &out))
- {
+ if (!cmSystemTools::RunSingleCommand(cmd.c_str(), &out, &out)) {
return path;
- }
- else
- {
+ } else {
out.erase(out.find_last_of('\n'));
return out;
- }
+ }
#else
return path;
#endif
}
-std::string
-cmExtraEclipseCDT4Generator::GetPathBasename(const std::string& path)
+std::string cmExtraEclipseCDT4Generator::GetPathBasename(
+ const std::string& path)
{
std::string outputBasename = path;
while (!outputBasename.empty() &&
(outputBasename[outputBasename.size() - 1] == '/' ||
- outputBasename[outputBasename.size() - 1] == '\\'))
- {
+ outputBasename[outputBasename.size() - 1] == '\\')) {
outputBasename.resize(outputBasename.size() - 1);
- }
+ }
std::string::size_type loc = outputBasename.find_last_of("/\\");
- if (loc != std::string::npos)
- {
+ if (loc != std::string::npos) {
outputBasename = outputBasename.substr(loc + 1);
- }
+ }
return outputBasename;
}
-std::string
-cmExtraEclipseCDT4Generator::GenerateProjectName(const std::string& name,
- const std::string& type,
- const std::string& path)
+std::string cmExtraEclipseCDT4Generator::GenerateProjectName(
+ const std::string& name, const std::string& type, const std::string& path)
{
return name + (type.empty() ? "" : "-") + type + "@" + path;
}
// Helper functions
-void cmExtraEclipseCDT4Generator
-::AppendStorageScanners(cmXMLWriter& xml,
- const cmMakefile& makefile)
+void cmExtraEclipseCDT4Generator::AppendStorageScanners(
+ cmXMLWriter& xml, const cmMakefile& makefile)
{
// we need the "make" and the C (or C++) compiler which are used, Alex
std::string make = makefile.GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
std::string compiler = makefile.GetSafeDefinition("CMAKE_C_COMPILER");
std::string arg1 = makefile.GetSafeDefinition("CMAKE_C_COMPILER_ARG1");
- if (compiler.empty())
- {
+ if (compiler.empty()) {
compiler = makefile.GetSafeDefinition("CMAKE_CXX_COMPILER");
arg1 = makefile.GetSafeDefinition("CMAKE_CXX_COMPILER_ARG1");
- }
- if (compiler.empty()) //Hmm, what to do now ?
- {
+ }
+ if (compiler.empty()) // Hmm, what to do now ?
+ {
compiler = "gcc";
- }
+ }
// the following right now hardcodes gcc behaviour :-/
std::string compilerArgs =
- "-E -P -v -dD ${plugin_state_location}/${specs_file}";
- if (!arg1.empty())
- {
+ "-E -P -v -dD ${plugin_state_location}/${specs_file}";
+ if (!arg1.empty()) {
arg1 += " ";
compilerArgs = arg1 + compilerArgs;
- }
+ }
xml.StartElement("storageModule");
xml.Attribute("moduleId", "scannerConfiguration");
@@ -1218,19 +1091,15 @@ void cmExtraEclipseCDT4Generator
xml.Attribute("enabled", "true");
xml.Attribute("problemReportingEnabled", "true");
xml.Attribute("selectedProfileId",
- "org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile");
+ "org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile");
xml.EndElement(); // autodiscovery
- cmExtraEclipseCDT4Generator::AppendScannerProfile(xml,
- "org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile",
- true, "", true, "specsFile",
- compilerArgs,
- compiler, true, true);
- cmExtraEclipseCDT4Generator::AppendScannerProfile(xml,
- "org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile",
- true, "", true, "makefileGenerator",
- "-f ${project_name}_scd.mk",
- make, true, true);
+ cmExtraEclipseCDT4Generator::AppendScannerProfile(
+ xml, "org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile", true,
+ "", true, "specsFile", compilerArgs, compiler, true, true);
+ cmExtraEclipseCDT4Generator::AppendScannerProfile(
+ xml, "org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile", true, "",
+ true, "makefileGenerator", "-f ${project_name}_scd.mk", make, true, true);
xml.EndElement(); // storageModule
}
@@ -1243,21 +1112,17 @@ void cmExtraEclipseCDT4Generator
// finally the assembly files "[to asm] ". Note the "to" in "to asm",
// without it, "asm" would be the first targets in the list, with the "to"
// they are the last targets, which makes more sense.
-void cmExtraEclipseCDT4Generator::AppendTarget(cmXMLWriter& xml,
- const std::string& target,
- const std::string& make,
- const std::string& makeArgs,
- const std::string& path,
- const char* prefix,
- const char* makeTarget
- )
+void cmExtraEclipseCDT4Generator::AppendTarget(
+ cmXMLWriter& xml, const std::string& target, const std::string& make,
+ const std::string& makeArgs, const std::string& path, const char* prefix,
+ const char* makeTarget)
{
xml.StartElement("target");
xml.Attribute("name", prefix + target);
xml.Attribute("path", path);
xml.Attribute("targetID", "org.eclipse.cdt.make.MakeTargetBuilder");
xml.Element("buildCommand",
- cmExtraEclipseCDT4Generator::GetEclipsePath(make));
+ cmExtraEclipseCDT4Generator::GetEclipsePath(make));
xml.Element("buildArguments", makeArgs);
xml.Element("buildTarget", makeTarget ? makeTarget : target.c_str());
xml.Element("stopOnError", "true");
@@ -1265,17 +1130,12 @@ void cmExtraEclipseCDT4Generator::AppendTarget(cmXMLWriter& xml,
xml.EndElement();
}
-void cmExtraEclipseCDT4Generator
-::AppendScannerProfile(cmXMLWriter& xml,
- const std::string& profileID,
- bool openActionEnabled,
- const std::string& openActionFilePath,
- bool pParserEnabled,
- const std::string& scannerInfoProviderID,
- const std::string& runActionArguments,
- const std::string& runActionCommand,
- bool runActionUseDefault,
- bool sipParserEnabled)
+void cmExtraEclipseCDT4Generator::AppendScannerProfile(
+ cmXMLWriter& xml, const std::string& profileID, bool openActionEnabled,
+ const std::string& openActionFilePath, bool pParserEnabled,
+ const std::string& scannerInfoProviderID,
+ const std::string& runActionArguments, const std::string& runActionCommand,
+ bool runActionUseDefault, bool sipParserEnabled)
{
xml.StartElement("profile");
xml.Attribute("id", profileID);
@@ -1305,22 +1165,20 @@ void cmExtraEclipseCDT4Generator
xml.EndElement(); // profile
}
-void cmExtraEclipseCDT4Generator
-::AppendLinkedResource (cmXMLWriter& xml,
- const std::string& name,
- const std::string& path,
- LinkType linkType)
+void cmExtraEclipseCDT4Generator::AppendLinkedResource(cmXMLWriter& xml,
+ const std::string& name,
+ const std::string& path,
+ LinkType linkType)
{
const char* locationTag = "location";
int typeTag = 2;
if (linkType == VirtualFolder) // ... and not a linked folder
- {
+ {
locationTag = "locationURI";
- }
- if (linkType == LinkToFile)
- {
+ }
+ if (linkType == LinkToFile) {
typeTag = 1;
- }
+ }
xml.StartElement("link");
xml.Element("name", name);