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

Merge topic 'FixVirtualFoldersInEclipse' 

a7d8d49 -fix VirtualFolders in Eclipse under Windows
This commit is contained in:
Brad King 2011-05-10 13:58:15 -04:00 committed by CMake Topic Stage
parent c32262bc04 a7d8d49b8f
commit a4d935933b
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmExtraEclipseCDT4Generator.cxx
View File

@ -403,7 +403,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
// for each sub project create a linked resource to the source dir // for each sub project create a linked resource to the source dir
// - only if it is an out-of-source build // - only if it is an out-of-source build
this->AppendLinkedResource(fout, "[Subprojects]", this->AppendLinkedResource(fout, "[Subprojects]",
"virtual:/virtual"); "virtual:/virtual", true);
for (std::map<cmStdString, std::vector<cmLocalGenerator*> >::const_iterator for (std::map<cmStdString, std::vector<cmLocalGenerator*> >::const_iterator
it = this->GlobalGenerator->GetProjectMap().begin(); it = this->GlobalGenerator->GetProjectMap().begin();
@ -1082,17 +1082,24 @@ void cmExtraEclipseCDT4Generator
void cmExtraEclipseCDT4Generator void cmExtraEclipseCDT4Generator
::AppendLinkedResource (cmGeneratedFileStream& fout, ::AppendLinkedResource (cmGeneratedFileStream& fout,
const std::string& name, const std::string& name,
const std::string& path) const std::string& path,
bool isVirtualFolder)
{ {
const char* locationTag = "location";
if (isVirtualFolder) // ... and not a linked folder
{
locationTag = "locationURI";
}
fout << fout <<
"\t\t<link>\n" "\t\t<link>\n"
"\t\t\t<name>" "\t\t\t<name>"
<< cmExtraEclipseCDT4Generator::EscapeForXML(name) << cmExtraEclipseCDT4Generator::EscapeForXML(name)
<< "</name>\n" << "</name>\n"
"\t\t\t<type>2</type>\n" "\t\t\t<type>2</type>\n"
"\t\t\t<locationURI>" "\t\t\t<" << locationTag << ">"
<< cmExtraEclipseCDT4Generator::EscapeForXML(path) << cmExtraEclipseCDT4Generator::EscapeForXML(path)
<< "</locationURI>\n" << "</" << locationTag << ">\n"
"\t\t</link>\n" "\t\t</link>\n"
; ;
} }

3
Source/cmExtraEclipseCDT4Generator.h
View File

@ -87,7 +87,8 @@ private:
static void AppendLinkedResource (cmGeneratedFileStream& fout, static void AppendLinkedResource (cmGeneratedFileStream& fout,
const std::string& name, const std::string& name,
const std::string& path); const std::string& path,
bool isVirtualFolder = false);
bool AppendOutLinkedResource(cmGeneratedFileStream& fout, bool AppendOutLinkedResource(cmGeneratedFileStream& fout,
const std::string& defname, const std::string& defname,