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

Merge topic 'EclipseUseGmakeErrorParser_13699' 

c46b46b Use GmakeErrorParser instead of deprecated MakeErrorParser (fixes bug 0013699)
This commit is contained in:
Brad King 2013-05-16 14:37:32 -04:00 committed by CMake Topic Stage
parent 823022dd2e c46b46b628
commit 27e4ddcd3f
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmExtraEclipseCDT4Generator.cxx
View File

@ -39,6 +39,7 @@ cmExtraEclipseCDT4Generator
this->SupportsVirtualFolders = true; this->SupportsVirtualFolders = true;
this->GenerateLinkedResources = true; this->GenerateLinkedResources = true;
this->SupportsGmakeErrorParser = true;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -77,6 +78,10 @@ void cmExtraEclipseCDT4Generator::Generate()
{ {
this->SupportsVirtualFolders = false; this->SupportsVirtualFolders = false;
} }
if (version < 3007) // 3.7 is Indigo
{
this->SupportsGmakeErrorParser = false;
}
} }
} }
@ -403,8 +408,17 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
{ {
fout << "org.eclipse.cdt.core.ICCErrorParser;"; fout << "org.eclipse.cdt.core.ICCErrorParser;";
} }
if (this->SupportsGmakeErrorParser)
{
fout << "org.eclipse.cdt.core.GmakeErrorParser;";
}
else
{
fout << "org.eclipse.cdt.core.MakeErrorParser;";
}
fout << fout <<
"org.eclipse.cdt.core.MakeErrorParser;"
"org.eclipse.cdt.core.GCCErrorParser;" "org.eclipse.cdt.core.GCCErrorParser;"
"org.eclipse.cdt.core.GASErrorParser;" "org.eclipse.cdt.core.GASErrorParser;"
"org.eclipse.cdt.core.GLDErrorParser;" "org.eclipse.cdt.core.GLDErrorParser;"

1
Source/cmExtraEclipseCDT4Generator.h
View File

@ -111,6 +111,7 @@ private:
bool GenerateSourceProject; bool GenerateSourceProject;
bool GenerateLinkedResources; bool GenerateLinkedResources;
bool SupportsVirtualFolders; bool SupportsVirtualFolders;
bool SupportsGmakeErrorParser;
}; };