summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAlex Neundorf <neundorf@kde.org>2011-10-15 19:04:23 (GMT)
committerAlex Neundorf <neundorf@kde.org>2011-10-15 19:04:23 (GMT)
commitdcd245913c41249637010f6b804e4ee4207ccc8f (patch)
tree0df2a0cb3afb8872728d782d53bf04b98018dc5f /Modules
parentb4b2fc33f936631b826456bfa098dcd2702e914d (diff)
downloadCMake-dcd245913c41249637010f6b804e4ee4207ccc8f.zip
CMake-dcd245913c41249637010f6b804e4ee4207ccc8f.tar.gz
CMake-dcd245913c41249637010f6b804e4ee4207ccc8f.tar.bz2
Eclipse: better message when Eclipse version could not be determined
Alex
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CMakeFindEclipseCDT4.cmake14
1 files changed, 7 insertions, 7 deletions
diff --git a/Modules/CMakeFindEclipseCDT4.cmake b/Modules/CMakeFindEclipseCDT4.cmake
index 02ce44a..cf0984e 100644
--- a/Modules/CMakeFindEclipseCDT4.cmake
+++ b/Modules/CMakeFindEclipseCDT4.cmake
@@ -27,13 +27,6 @@ FUNCTION(_FIND_ECLIPSE_VERSION)
ENDIF()
ENDIF()
- IF(_ECLIPSE_VERSION)
- MESSAGE(STATUS "Found Eclipse version ${_ECLIPSE_VERSION}")
- ELSE()
- SET(_ECLIPSE_VERSION "3.6" )
- MESSAGE(STATUS "Could not determine Eclipse version, assuming ${_ECLIPSE_VERSION}")
- ENDIF()
-
# Set up a map with the names of the Eclipse releases:
SET(_ECLIPSE_VERSION_NAME_ "Unknown" )
SET(_ECLIPSE_VERSION_NAME_3.2 "Callisto" )
@@ -43,6 +36,13 @@ FUNCTION(_FIND_ECLIPSE_VERSION)
SET(_ECLIPSE_VERSION_NAME_3.6 "Helios" )
SET(_ECLIPSE_VERSION_NAME_3.7 "Indigo" )
+ IF(_ECLIPSE_VERSION)
+ MESSAGE(STATUS "Found Eclipse version ${_ECLIPSE_VERSION} (${_ECLIPSE_VERSION_NAME_${_ECLIPSE_VERSION}})")
+ ELSE()
+ SET(_ECLIPSE_VERSION "3.6" )
+ MESSAGE(STATUS "Could not determine Eclipse version, assuming at least ${_ECLIPSE_VERSION} (${_ECLIPSE_VERSION_NAME_${_ECLIPSE_VERSION}}). Adjust CMAKE_ECLIPSE_VERSION if this is wrong.")
+ ENDIF()
+
SET(CMAKE_ECLIPSE_VERSION "${_ECLIPSE_VERSION} (${_ECLIPSE_VERSION_NAME_${_ECLIPSE_VERSION}})" CACHE STRING "The version of Eclipse. If Eclipse has not been found, 3.6 (Helios) is assumed.")
SET_PROPERTY(CACHE CMAKE_ECLIPSE_VERSION PROPERTY STRINGS "3.2 (${_ECLIPSE_VERSION_NAME_3.2})"
"3.3 (${_ECLIPSE_VERSION_NAME_3.3})"