diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2010-01-07 19:19:59 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2010-01-07 19:19:59 +0000 |
| commit | 298082f55111f0e4c4d732d0a44a95cd3e9b1d35 (patch) | |
| tree | 4beed01bb142ee258b28aedb730b7c265aa4f56c | |
| parent | 026aad30839321091733ed5f168bc022677208b4 (diff) | |
| download | extra-cmake-modules-298082f55111f0e4c4d732d0a44a95cd3e9b1d35.tar.gz extra-cmake-modules-298082f55111f0e4c4d732d0a44a95cd3e9b1d35.tar.bz2 | |
-we require 2.6.2, nothing else, we can discuss a higher version for 4.5, not for 4.4.x.
How can you change like the most important property of our buildsystem while branching for the release without even letting kde-buildsystem or the maintainer (me) know ???
Alex
CCMAIL: release-team@kde.org
svn path=/branches/KDE/4.4/kdelibs/; revision=1071246
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 2 | ||||
| -rw-r--r-- | modules/FindSharedDesktopOntologies.cmake | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 672a6db5..c6f5599e 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -275,7 +275,7 @@ # this is required now by cmake 2.6 and so must not be skipped by if(KDE4_FOUND) below -cmake_minimum_required(VERSION 2.6.3 FATAL_ERROR) +cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR) # set the cmake policies to the 2.4.x compatibility settings (may change for KDE 4.3) cmake_policy(VERSION 2.4.5) diff --git a/modules/FindSharedDesktopOntologies.cmake b/modules/FindSharedDesktopOntologies.cmake index 2bca1df3..eecd608a 100644 --- a/modules/FindSharedDesktopOntologies.cmake +++ b/modules/FindSharedDesktopOntologies.cmake @@ -21,7 +21,14 @@ # First try the SharedDesktopOntologiesConfig.cmake from shared-desktop-ontologies 0.2 and newer -find_package(SharedDesktopOntologies ${SharedDesktopOntologies_FIND_VERSION} QUIET NO_MODULE) + +# This is to make it work with cmake 2.6.2, since SDO 0.2 installs its config file into +# the 2.6.3 compatible location only ( share/cmake/SDO/ instead share/SDO/[cmake/] ) +if( "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_LESS "2.6.3") + find_path(_SDO_CONFIG_DIR SharedDesktopOntologiesConfig.cmake PATH_SUFFIXES share/cmake/SharedDesktopOntologies/ ) +endif( "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_LESS "2.6.3") + +find_package(SharedDesktopOntologies ${SharedDesktopOntologies_FIND_VERSION} QUIET NO_MODULE HINTS "${_SDO_CONFIG_DIR}" ) if (SHAREDDESKTOPONTOLOGIES_ROOT_DIR) mark_as_advanced(SHAREDDESKTOPONTOLOGIES_ROOT_DIR) |