[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [rekonq/frameworks] /: enhance ECM, Qt, KF5 requirements
From:       Andrea Diamantini <adjam7 () gmail ! com>
Date:       2014-07-12 17:39:05
Message-ID: E1X61GL-0000Ef-Na () scm ! kde ! org
[Download RAW message or body]

Git commit 40122b5a79e3889a7efb1bb536b0b4bbad538bb2 by Andrea Diamantini.
Committed on 11/07/2014 at 09:01.
Pushed by adjam into branch 'frameworks'.

enhance ECM, Qt, KF5 requirements

M  +5    -8    CMakeLists.txt

http://commits.kde.org/rekonq/40122b5a79e3889a7efb1bb536b0b4bbad538bb2

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 039a53d..2edfbda 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@ SET (REKONQ_SITE "http://rekonq.kde.org")
 # ==================================================================================
 # Extra CMake Modules
 
-FIND_PACKAGE (ECM 0.0.9 REQUIRED NO_MODULE)
+FIND_PACKAGE (ECM 1.0.0 REQUIRED NO_MODULE)
 
 SET (CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 
@@ -49,15 +49,16 @@ INCLUDE (KDEFrameworkCompilerSettings)
 # ==================================================================================
 # Qt 5
     
-SET (QT_MIN_VERSION "5.2.0")
+SET (QT_MIN_VERSION "5.3.0")
 
 FIND_PACKAGE(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Gui Widgets Network Script \
WebKitWidgets Concurrent)  
 # ==================================================================================
 # KDE Frameworks
 
-SET (KF5_MIN_VERSION "4.96.0")
+SET (KF5_MIN_VERSION "5.0.0")
 
+# FIXME: Min version check
 FIND_PACKAGE (KF5 CONFIG REQUIRED
     Auth
     Bookmarks
@@ -87,10 +88,6 @@ FIND_PACKAGE (KF5 CONFIG REQUIRED
     WebKit
 )
 
-SET(KF5_VERSION_STRING
-    "${KF5_VERSION_MAJOR}.${KF5_VERSION_MINOR}.${KF5_VERSION_PATCH}"
-   )
-
 
 # ==================================================================================
 # optional nepomuk requirements
@@ -150,7 +147,7 @@ MESSAGE(STATUS "")
 
 IF(KF5_FOUND)
     MESSAGE(STATUS " KDE Desktop Environment............... YES")
-    MESSAGE(STATUS " KDE version ${KF5_VERSION_STRING} found! ")
+    MESSAGE(STATUS " KDE version ${KF5_VERSION} found! ")
 ELSE(KF5_FOUND)
     MESSAGE(STATUS " KDE Desktop Environment............... NO")
     MESSAGE(STATUS "")


[prev in list] [next in list] [prev in thread] [next in thread]