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

Eclipse: add Build and Clean targets to targets 

With this commit the virtual folder for the targets now
have "Build" and "Clean" targets associated to them, so you can
build and clean per-target now in the project explorer.

Alex
This commit is contained in:
Alex Neundorf 2011-10-23 12:25:33 +02:00
parent c3f30bdd63
commit 117f2b8257
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Source/cmExtraEclipseCDT4Generator.cxx
View File

@ -888,6 +888,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
const std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM"); const std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
const std::string makeArgs = mf->GetSafeDefinition( const std::string makeArgs = mf->GetSafeDefinition(
"CMAKE_ECLIPSE_MAKE_ARGUMENTS"); "CMAKE_ECLIPSE_MAKE_ARGUMENTS");
const std::string cmake = mf->GetRequiredDefinition("CMAKE_COMMAND");
cmGlobalGenerator* generator cmGlobalGenerator* generator
= const_cast<cmGlobalGenerator*>(this->GlobalGenerator); = const_cast<cmGlobalGenerator*>(this->GlobalGenerator);
@ -976,6 +978,25 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
std::string fastTarget = ti->first; std::string fastTarget = ti->first;
fastTarget += "/fast"; fastTarget += "/fast";
this->AppendTarget(fout, fastTarget, make, makeArgs, subdir, prefix); this->AppendTarget(fout, 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 += ti->first;
this->AppendTarget(fout, "Build", make, makeArgs, virtDir, "",
ti->first.c_str());
std::string cleanArgs = "-E chdir \"";
cleanArgs += makefile->GetCurrentOutputDirectory();
cleanArgs += "\" \"";
cleanArgs += cmake;
cleanArgs += "\" -P \"";
cleanArgs += (*it)->GetTargetDirectory(ti->second);
cleanArgs += "/cmake_clean.cmake\"";
this->AppendTarget(fout, "Clean", cmake, cleanArgs, virtDir, "", "");
}
} }
break; break;
// ignore these: // ignore these:
@ -1160,9 +1181,17 @@ void cmExtraEclipseCDT4Generator::AppendTarget(cmGeneratedFileStream& fout,
const std::string& make, const std::string& make,
const std::string& makeArgs, const std::string& makeArgs,
const std::string& path, const std::string& path,
const char* prefix) const char* prefix,
const char* makeTarget
)
{ {
std::string targetXml = cmExtraEclipseCDT4Generator::EscapeForXML(target); std::string targetXml = cmExtraEclipseCDT4Generator::EscapeForXML(target);
std::string makeTargetXml = targetXml;
if (makeTarget != NULL)
{
makeTargetXml = cmExtraEclipseCDT4Generator::EscapeForXML(makeTarget);
}
cmExtraEclipseCDT4Generator::EscapeForXML(target);
std::string pathXml = cmExtraEclipseCDT4Generator::EscapeForXML(path); std::string pathXml = cmExtraEclipseCDT4Generator::EscapeForXML(path);
fout << fout <<
"<target name=\"" << prefix << targetXml << "\"" "<target name=\"" << prefix << targetXml << "\""
@ -1172,7 +1201,7 @@ void cmExtraEclipseCDT4Generator::AppendTarget(cmGeneratedFileStream& fout,
<< cmExtraEclipseCDT4Generator::GetEclipsePath(make) << cmExtraEclipseCDT4Generator::GetEclipsePath(make)
<< "</buildCommand>\n" << "</buildCommand>\n"
"<buildArguments>" << makeArgs << "</buildArguments>\n" "<buildArguments>" << makeArgs << "</buildArguments>\n"
"<buildTarget>" << targetXml << "</buildTarget>\n" "<buildTarget>" << makeTargetXml << "</buildTarget>\n"
"<stopOnError>true</stopOnError>\n" "<stopOnError>true</stopOnError>\n"
"<useDefaultCommand>false</useDefaultCommand>\n" "<useDefaultCommand>false</useDefaultCommand>\n"
"</target>\n" "</target>\n"

3
Source/cmExtraEclipseCDT4Generator.h
View File

@ -75,7 +75,8 @@ private:
const std::string& make, const std::string& make,
const std::string& makeArguments, const std::string& makeArguments,
const std::string& path, const std::string& path,
const char* prefix = ""); const char* prefix = "",
const char* makeTarget = NULL);
static void AppendScannerProfile (cmGeneratedFileStream& fout, static void AppendScannerProfile (cmGeneratedFileStream& fout,
const std::string& profileID, const std::string& profileID,
bool openActionEnabled, bool openActionEnabled,