From bcccddc7e99336faabe7d15f121d41282773cfcc Mon Sep 17 00:00:00 2001
From: Alex Neundorf <neundorf@kde.org>
Date: Sat, 28 Jul 2012 11:40:08 +0200
Subject: [PATCH 1/2] Eclipse: add support for the 4.2 Juno release (#13367)

Thanks for the path to Nicholas Yue.

Alex
---
 Modules/CMakeFindEclipseCDT4.cmake | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Modules/CMakeFindEclipseCDT4.cmake b/Modules/CMakeFindEclipseCDT4.cmake
index a4264e78e..80c51c1f7 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()

From 53cc1026bcf446c4e854bac7d6885879f4d8c64a Mon Sep 17 00:00:00 2001
From: Alex Neundorf <neundorf@kde.org>
Date: Sat, 28 Jul 2012 11:58:04 +0200
Subject: [PATCH 2/2] 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
---
 Modules/CMakeFindEclipseCDT4.cmake | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Modules/CMakeFindEclipseCDT4.cmake b/Modules/CMakeFindEclipseCDT4.cmake
index 80c51c1f7..86c1a1bc2 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()