diff options
| author | Alex Neundorf <neundorf@kde.org> | 2012-02-18 19:22:05 +0100 |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2012-02-18 19:22:05 +0100 |
| commit | eea3beeb24edfa16164c63ca1ddb232a490dea48 (patch) | |
| tree | 329d14eea477a19773cf3586259f30794ed16286 | |
| parent | 21a9b7542a3d8dfe9608e813014c82d1645972f2 (diff) | |
| download | extra-cmake-modules-eea3beeb24edfa16164c63ca1ddb232a490dea48.tar.gz extra-cmake-modules-eea3beeb24edfa16164c63ca1ddb232a490dea48.tar.bz2 | |
-make it work with cmake 2.8.7, i.e. warn only instead of failing
Alex
| -rw-r--r-- | kde-modules/KDECompilerSettings.cmake | 24 | ||||
| -rw-r--r-- | modules/ECMVersion.cmake | 2 |
2 files changed, 15 insertions, 11 deletions
diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake index 603c1504..79ebb0b6 100644 --- a/kde-modules/KDECompilerSettings.cmake +++ b/kde-modules/KDECompilerSettings.cmake @@ -375,19 +375,23 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") # CMAKE_CXX_COMPILER_VERSION exists since cmake 2.8.7.20120217 if(NOT CMAKE_CXX_COMPILER_VERSION) - message(FATAL_ERROR "Your CMake is too old. You need current git master.") - endif() - - if(NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.1.0") + message(STATUS "************** Your CMake is old. Better update to git master.") set(GCC_IS_NEWER_THAN_4_1 TRUE) - endif() - - if(NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.2.0") set(GCC_IS_NEWER_THAN_4_2 TRUE) - endif() - - if(NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.3.0") set(GCC_IS_NEWER_THAN_4_3 TRUE) + else() + + if(NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.1.0") + set(GCC_IS_NEWER_THAN_4_1 TRUE) + endif() + + if(NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.2.0") + set(GCC_IS_NEWER_THAN_4_2 TRUE) + endif() + + if(NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.3.0") + set(GCC_IS_NEWER_THAN_4_3 TRUE) + endif() endif() # save a little by making local statics not threadsafe diff --git a/modules/ECMVersion.cmake b/modules/ECMVersion.cmake index 575f835b..3b4a0c49 100644 --- a/modules/ECMVersion.cmake +++ b/modules/ECMVersion.cmake @@ -1,6 +1,6 @@ macro(ecm_version _major _minor _patch) - message(STATUS "ecm_version() is obsolete, use ecm_set_version_variables() instead") + message(STATUS "************** ecm_version() is obsolete, use ecm_set_version_variables() instead") set(ECM_VERSION_MAJOR ${_major}) set(ECM_VERSION_MINOR ${_minor}) set(ECM_VERSION_PATCH ${_patch}) |