From efde2196f9294744bdb22bc443714eb3456e6287 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Thu, 27 Mar 2008 19:43:16 +0000 Subject: never skip cmake_minimum_required(), otherwise cmake 2.6 generates warnings Alex svn path=/trunk/KDE/kdelibs/; revision=790890 --- modules/FindKDE4Internal.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index c49c874b..bcfd6171 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -212,6 +212,8 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# this is required now by cmake 2.6 and so must not be skipped by if(KDE4_FOUND) below +cmake_minimum_required(VERSION 2.4.5 FATAL_ERROR) if(KDE4_FOUND) # Already found in this cmake run, nothing more to do @@ -219,8 +221,6 @@ else(KDE4_FOUND) include (MacroEnsureVersion) -cmake_minimum_required(VERSION 2.4.5 FATAL_ERROR) - set(QT_MIN_VERSION "4.4.0") #this line includes FindQt4.cmake, which searches the Qt library and headers find_package(Qt4 REQUIRED) -- cgit v1.2.1