branches/KDE/4.4/kdelibs/cmake/modules

[Alexander Neundorf]

SVN commit 1071246 by neundorf:

-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 at kde.org



 M  +1 -1      FindKDE4Internal.cmake  
 M  +8 -1      FindSharedDesktopOntologies.cmake  


--- branches/KDE/4.4/kdelibs/cmake/modules/FindKDE4Internal.cmake #1071245:1071246
@@ -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)
 
--- branches/KDE/4.4/kdelibs/cmake/modules/FindSharedDesktopOntologies.cmake #1071245:1071246
@@ -21,8 +21,15 @@
 
 
 # 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)
 endif (SHAREDDESKTOPONTOLOGIES_ROOT_DIR)