diff options
| author | Alex Neundorf <neundorf@kde.org> | 2012-07-28 11:58:04 +0200 |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2012-07-28 11:58:04 +0200 |
| commit | 53cc1026bcf446c4e854bac7d6885879f4d8c64a (patch) | |
| tree | ebf6519e73f7648e613e5b6ed4e09551155aa8e6 | |
| parent | bcccddc7e99336faabe7d15f121d41282773cfcc (diff) | |
| download | cmake-53cc1026bcf446c4e854bac7d6885879f4d8c64a.tar.gz | |
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
| -rw-r--r-- | Modules/CMakeFindEclipseCDT4.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/CMakeFindEclipseCDT4.cmake b/Modules/CMakeFindEclipseCDT4.cmake index 80c51c1f74..86c1a1bc22 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() |