[Cmake-commits] CMake branch, next, updated. v2.8.7-3318-g5afdc89

[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  5afdc89dafe23e0ba24f46a6d4b5465dbdd8b569 (commit)
       via  00af40b29b5170b9709b6a676bf765595d9a0aee (commit)
      from  e93b9ffc78a129b0acc9f57d7a68d04711fdd1fa (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=5afdc89dafe23e0ba24f46a6d4b5465dbdd8b569
commit 5afdc89dafe23e0ba24f46a6d4b5465dbdd8b569
Merge: e93b9ff 00af40b
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Tue Mar 20 17:09:24 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 20 17:09:24 2012 -0400

    Merge topic 'UseRealPathWhenFindingEclipse' into next
    
    00af40b Eclipse: fix #13036, make version detection work with symlinks


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00af40b29b5170b9709b6a676bf765595d9a0aee
commit 00af40b29b5170b9709b6a676bf765595d9a0aee
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Mar 20 22:06:38 2012 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Mar 20 22:06:38 2012 +0100

    Eclipse: fix #13036, make version detection work with symlinks
    
    This patch uses get_filename_component(REALPATH) so symlinks in the path
    to Eclipse are resolved, which makes the version detection work in such cases.
    
    Alex

diff --git a/Modules/CMakeFindEclipseCDT4.cmake b/Modules/CMakeFindEclipseCDT4.cmake
index dd06128..a4264e7 100644
--- a/Modules/CMakeFindEclipseCDT4.cmake
+++ b/Modules/CMakeFindEclipseCDT4.cmake
@@ -20,7 +20,9 @@ FIND_PROGRAM(CMAKE_ECLIPSE_EXECUTABLE NAMES eclipse DOC "The Eclipse executable"
 FUNCTION(_FIND_ECLIPSE_VERSION)
   # This code is in a function so the variables used here have only local scope
   IF(CMAKE_ECLIPSE_EXECUTABLE)
-    GET_FILENAME_COMPONENT(_ECLIPSE_DIR "${CMAKE_ECLIPSE_EXECUTABLE}" PATH)
+    # use REALPATH to resolve symlinks (http://public.kitware.com/Bug/view.php?id=13036)
+    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("${_ECLIPSE_FEATURE_DIR}" MATCHES ".+org.eclipse.platform_([0-9]+\\.[0-9]+).+")
       SET(_ECLIPSE_VERSION ${CMAKE_MATCH_1})

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

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


hooks/post-receive
-- 
CMake