From ea9b3661dab69cc23717dda88aee08749afa9383 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 26 Oct 2011 11:28:35 +0200 Subject: Decrease the minimum Qt version and use pkgconfig to find the QtWebkit one. --- CMakeLists.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e00ecb8d..fe562612 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,17 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4) # ================================================================================== -FIND_PACKAGE(Qt4 4.8.0 COMPONENTS QtCore QtGui QtNetwork QtWebKit REQUIRED) +FIND_PACKAGE(Qt4 4.7.0 COMPONENTS QtCore QtGui QtNetwork QtWebKit REQUIRED) + +# Ensure we have QtWebKit >=2.2.0 +FIND_PACKAGE(PkgConfig REQUIRED) +PKG_CHECK_MODULES(PC_QTWEBKIT QUIET QtWebKit>=4.9.0) +IF(NOT PC_QTWEBKIT_FOUND) + MESSAGE(FATAL_ERROR "QtWebkit 2.2.0 is required for this version of Rekonq") +ELSE() + MESSAGE(STATUS "Found QtWebKit ${PC_QTWEBKIT_VERSION}") +ENDIF() + FIND_PACKAGE(KDE4 4.6.90 REQUIRED) INCLUDE(MacroOptionalFindPackage) -- cgit v1.2.1