[Cmake-commits] CMake branch, next, updated. v2.8.8-3581-g185faf5

[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  185faf5db13866d04407d1c01b933b4330d235cd (commit)
       via  53cc1026bcf446c4e854bac7d6885879f4d8c64a (commit)
       via  bcccddc7e99336faabe7d15f121d41282773cfcc (commit)
      from  2a190dd059ab8293d989684fe560b898110a2ce8 (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=185faf5db13866d04407d1c01b933b4330d235cd
commit 185faf5db13866d04407d1c01b933b4330d235cd
Merge: 2a190dd 53cc102
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Sat Jul 28 06:02:18 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jul 28 06:02:18 2012 -0400

    Merge topic 'EclipseAddSupportForJuno' into next
    
    53cc102 Eclipse: improve (fix ?) version detection on OSX
    bcccddc Eclipse: add support for the 4.2 Juno release (#13367)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53cc1026bcf446c4e854bac7d6885879f4d8c64a
commit 53cc1026bcf446c4e854bac7d6885879f4d8c64a
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sat Jul 28 11:58:04 2012 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Sat Jul 28 11:58:04 2012 +0200

    Eclipse: improve (fix ?) version detection on OSX
    
    This is probably related to a framework installation I guess.
    This is part of the patch in #13367 from Nicholas Yue.
    
    Alex

diff --git a/Modules/CMakeFindEclipseCDT4.cmake b/Modules/CMakeFindEclipseCDT4.cmake
index 80c51c1..86c1a1b 100644
--- a/Modules/CMakeFindEclipseCDT4.cmake
+++ b/Modules/CMakeFindEclipseCDT4.cmake
@@ -24,6 +24,9 @@ FUNCTION(_FIND_ECLIPSE_VERSION)
     GET_FILENAME_COMPONENT(_REALPATH_CMAKE_ECLIPSE_EXECUTABLE "${CMAKE_ECLIPSE_EXECUTABLE}" REALPATH)
     GET_FILENAME_COMPONENT(_ECLIPSE_DIR "${_REALPATH_CMAKE_ECLIPSE_EXECUTABLE}" PATH)
     FILE(GLOB _ECLIPSE_FEATURE_DIR "${_ECLIPSE_DIR}/features/org.eclipse.platform*")
+    IF(APPLE AND NOT _ECLIPSE_FEATURE_DIR)
+      FILE(GLOB _ECLIPSE_FEATURE_DIR "${_ECLIPSE_DIR}/../../../features/org.eclipse.platform*")
+    ENDIF()
     IF("${_ECLIPSE_FEATURE_DIR}" MATCHES ".+org.eclipse.platform_([0-9]+\\.[0-9]+).+")
       SET(_ECLIPSE_VERSION ${CMAKE_MATCH_1})
     ENDIF()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bcccddc7e99336faabe7d15f121d41282773cfcc
commit bcccddc7e99336faabe7d15f121d41282773cfcc
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sat Jul 28 11:40:08 2012 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Sat Jul 28 11:40:08 2012 +0200

    Eclipse: add support for the 4.2 Juno release (#13367)
    
    Thanks for the path to Nicholas Yue.
    
    Alex

diff --git a/Modules/CMakeFindEclipseCDT4.cmake b/Modules/CMakeFindEclipseCDT4.cmake
index a4264e7..80c51c1 100644
--- a/Modules/CMakeFindEclipseCDT4.cmake
+++ b/Modules/CMakeFindEclipseCDT4.cmake
@@ -37,6 +37,7 @@ FUNCTION(_FIND_ECLIPSE_VERSION)
   SET(_ECLIPSE_VERSION_NAME_3.5 "Galileo" )
   SET(_ECLIPSE_VERSION_NAME_3.6 "Helios" )
   SET(_ECLIPSE_VERSION_NAME_3.7 "Indigo" )
+  SET(_ECLIPSE_VERSION_NAME_4.2 "Juno" )
 
   IF(_ECLIPSE_VERSION)
     MESSAGE(STATUS "Found Eclipse version ${_ECLIPSE_VERSION} (${_ECLIPSE_VERSION_NAME_${_ECLIPSE_VERSION}})")
@@ -51,7 +52,9 @@ FUNCTION(_FIND_ECLIPSE_VERSION)
                                                             "3.4 (${_ECLIPSE_VERSION_NAME_3.4})"
                                                             "3.5 (${_ECLIPSE_VERSION_NAME_3.5})"
                                                             "3.6 (${_ECLIPSE_VERSION_NAME_3.6})"
-                                                            "3.7 (${_ECLIPSE_VERSION_NAME_3.7})")
+                                                            "3.7 (${_ECLIPSE_VERSION_NAME_3.7})"
+                                                            "4.2 (${_ECLIPSE_VERSION_NAME_4.2})"
+              )
 ENDFUNCTION()
 
 _FIND_ECLIPSE_VERSION()

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

Summary of changes:
 Modules/CMakeFindEclipseCDT4.cmake |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake