This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via e33ab852ac02636376ed2abce02a4599db7792be (commit) via c46b46b6285e4c893341659f0be8ac306060bf9b (commit) via 77df4ef5ac3b8fcae52d8f964756ec4fdf35e5c5 (commit) via 82f5936a8bc2a16c6d2c5e003a38cbc150cf349a (commit) from 264823f3fc02fbf7db1fd93546ad40718e1951e4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e33ab852ac02636376ed2abce02a4599db7792be commit e33ab852ac02636376ed2abce02a4599db7792be Merge: 264823f c46b46b Author: Alexander Neundorf <neund...@kde.org> AuthorDate: Sun Apr 28 09:55:57 2013 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sun Apr 28 09:55:57 2013 -0400 Merge topic 'EclipseUseGmakeErrorParser_13699' into next c46b46b Use GmakeErrorParser instead of deprecated MakeErrorParser (fixes bug 0013699) 77df4ef CMake Nightly Date Stamp 82f5936 CMake Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c46b46b6285e4c893341659f0be8ac306060bf9b commit c46b46b6285e4c893341659f0be8ac306060bf9b Author: Victor Zverovich <victor.zverov...@gmail.com> AuthorDate: Fri Mar 22 15:50:38 2013 -0700 Commit: Alex Neundorf <neund...@kde.org> CommitDate: Sun Apr 28 15:50:31 2013 +0200 Use GmakeErrorParser instead of deprecated MakeErrorParser (fixes bug 0013699) 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; }; ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- Source/cmExtraEclipseCDT4Generator.cxx | 16 +++++++++++++++- Source/cmExtraEclipseCDT4Generator.h | 1 + 3 files changed, 17 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits