diff options
| author | Victor Zverovich <victor.zverovich@gmail.com> | 2013-03-22 22:50:38 (GMT) |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2013-04-28 13:50:31 (GMT) |
| commit | c46b46b6285e4c893341659f0be8ac306060bf9b (patch) | |
| tree | e6f2e0b462a031c718ecf1bf41c93df02a7a0e58 | |
| parent | 77df4ef5ac3b8fcae52d8f964756ec4fdf35e5c5 (diff) | |
| download | CMake-c46b46b6285e4c893341659f0be8ac306060bf9b.zip CMake-c46b46b6285e4c893341659f0be8ac306060bf9b.tar.gz CMake-c46b46b6285e4c893341659f0be8ac306060bf9b.tar.bz2 | |
Use GmakeErrorParser instead of deprecated MakeErrorParser (fixes bug 0013699)
| -rw-r--r-- | Source/cmExtraEclipseCDT4Generator.cxx | 16 | ||||
| -rw-r--r-- | Source/cmExtraEclipseCDT4Generator.h | 1 |
2 files changed, 16 insertions, 1 deletions
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index 97ab086..22a1020 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -39,6 +39,7 @@ cmExtraEclipseCDT4Generator this->SupportsVirtualFolders = true; this->GenerateLinkedResources = true; + this->SupportsGmakeErrorParser = true; } //---------------------------------------------------------------------------- @@ -77,6 +78,10 @@ void cmExtraEclipseCDT4Generator::Generate() { 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;"; } + + if (this->SupportsGmakeErrorParser) + { + fout << "org.eclipse.cdt.core.GmakeErrorParser;"; + } + else + { + fout << "org.eclipse.cdt.core.MakeErrorParser;"; + } + fout << - "org.eclipse.cdt.core.MakeErrorParser;" "org.eclipse.cdt.core.GCCErrorParser;" "org.eclipse.cdt.core.GASErrorParser;" "org.eclipse.cdt.core.GLDErrorParser;" diff --git a/Source/cmExtraEclipseCDT4Generator.h b/Source/cmExtraEclipseCDT4Generator.h index 31ad68d..b31cce7 100644 --- a/Source/cmExtraEclipseCDT4Generator.h +++ b/Source/cmExtraEclipseCDT4Generator.h @@ -111,6 +111,7 @@ private: bool GenerateSourceProject; bool GenerateLinkedResources; bool SupportsVirtualFolders; + bool SupportsGmakeErrorParser; }; |