[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6601-g5f8900c

[Alexander Neundorf]

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  5f8900cb38086687051edbd9904dbe21819b5e9a (commit)
       via  e6b0f452ee1d2cbe26f9977c94470c223c13ab05 (commit)
       via  9e9debe505964525c9a8466b8d76ceb24b4ee022 (commit)
       via  403632c8ae1718cadc4e2102638bbd03e5d8d1fc (commit)
       via  1b7546c460c5390c0032c20b5a70a63b254059c0 (commit)
      from  967591d0f3258fa70d553addae8dfc18832ae787 (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=5f8900cb38086687051edbd9904dbe21819b5e9a
commit 5f8900cb38086687051edbd9904dbe21819b5e9a
Merge: 967591d e6b0f45
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Wed Jan 1 12:43:16 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 1 12:43:16 2014 -0500

    Merge topic 'EclipseUse64bitMachOParser' into next
    
    e6b0f45 Eclipse: use MachO64 parser starting with Helios (#14380)
    9e9debe CMake Nightly Date Stamp
    403632c CMake Nightly Date Stamp
    1b7546c CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6b0f452ee1d2cbe26f9977c94470c223c13ab05
commit e6b0f452ee1d2cbe26f9977c94470c223c13ab05
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Wed Jan 1 17:52:57 2014 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Wed Jan 1 17:52:57 2014 +0100

    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

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 755b445..c93187e 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -40,6 +40,7 @@ cmExtraEclipseCDT4Generator
   this->SupportsVirtualFolders = true;
   this->GenerateLinkedResources = true;
   this->SupportsGmakeErrorParser = true;
+  this->SupportsMachO64Parser = true;
 }
 
 //----------------------------------------------------------------------------
@@ -93,6 +94,7 @@ void cmExtraEclipseCDT4Generator::Generate()
       if (version < 3006) // 3.6 is Helios
         {
         this->SupportsVirtualFolders = false;
+        this->SupportsMachO64Parser = false;
         }
       if (version < 3007) // 3.7 is Indigo
         {
@@ -754,7 +756,9 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
       }
     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"
               "<attribute key=\"c++filt\" value=\"c++filt\"/>\n"
               "</extension>\n"
diff --git a/Source/cmExtraEclipseCDT4Generator.h b/Source/cmExtraEclipseCDT4Generator.h
index 9c89f85..d88b247 100644
--- a/Source/cmExtraEclipseCDT4Generator.h
+++ b/Source/cmExtraEclipseCDT4Generator.h
@@ -115,6 +115,7 @@ private:
   bool GenerateLinkedResources;
   bool SupportsVirtualFolders;
   bool SupportsGmakeErrorParser;
+  bool SupportsMachO64Parser;
 
 };
 

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake              |    2 +-
 Source/cmExtraEclipseCDT4Generator.cxx |    6 +++++-
 Source/cmExtraEclipseCDT4Generator.h   |    1 +
 3 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake