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

Eclipse: use MachO64 parser starting with Helios (#14380) 

With this patch, cmake now puts the MachO64 bit
binary file parser into the config file if the detected
Eclipse is at least Helios (7.0), otherwise with the old
parser executables will not be recognized by Eclipse.

Alex
This commit is contained in:
Alex Neundorf 2014-01-01 17:52:57 +01:00
parent 9e9debe505
commit e6b0f452ee
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmExtraEclipseCDT4Generator.cxx
View File

@ -40,6 +40,7 @@ cmExtraEclipseCDT4Generator
this->SupportsVirtualFolders = true; this->SupportsVirtualFolders = true;
this->GenerateLinkedResources = true; this->GenerateLinkedResources = true;
this->SupportsGmakeErrorParser = true; this->SupportsGmakeErrorParser = true;
this->SupportsMachO64Parser = true;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -93,6 +94,7 @@ void cmExtraEclipseCDT4Generator::Generate()
if (version < 3006) // 3.6 is Helios if (version < 3006) // 3.6 is Helios
{ {
this->SupportsVirtualFolders = false; this->SupportsVirtualFolders = false;
this->SupportsMachO64Parser = false;
} }
if (version < 3007) // 3.7 is Indigo if (version < 3007) // 3.7 is Indigo
{ {
@ -754,7 +756,9 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
} }
else if (systemName == "Darwin") else if (systemName == "Darwin")
{ {
fout << "<extension id=\"org.eclipse.cdt.core.MachO\"" fout << "<extension id=\"" <<
(this->SupportsMachO64Parser ? "org.eclipse.cdt.core.MachO64"
: "org.eclipse.cdt.core.MachO") << "\""
" point=\"org.eclipse.cdt.core.BinaryParser\">\n" " point=\"org.eclipse.cdt.core.BinaryParser\">\n"
"<attribute key=\"c++filt\" value=\"c++filt\"/>\n" "<attribute key=\"c++filt\" value=\"c++filt\"/>\n"
"</extension>\n" "</extension>\n"

1
Source/cmExtraEclipseCDT4Generator.h
View File

@ -115,6 +115,7 @@ private:
bool GenerateLinkedResources; bool GenerateLinkedResources;
bool SupportsVirtualFolders; bool SupportsVirtualFolders;
bool SupportsGmakeErrorParser; bool SupportsGmakeErrorParser;
bool SupportsMachO64Parser;
}; };