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

List:       kde-commits
Subject:    [kio-extras] /: Minor dependencies cleanup
From:       Hrvoje Senjan <hrvoje.senjan () gmail ! com>
Date:       2014-04-09 22:53:56
Message-ID: E1WY1NU-0001Z9-DW () scm ! kde ! org
[Download RAW message or body]

Git commit e6793e03a3c5ac6237673378aa327bb5a4d47ff4 by Hrvoje Senjan.
Committed on 09/04/2014 at 22:52.
Pushed by hrvojes into branch 'master'.

Minor dependencies cleanup

KWin and libksysguard are not required. Same with KDeclarative,
Plasma, KWindowSystem, Qt5Quick and Qt5Script. Added frameworks
in top CMakeLists where linked in subdirectories, so explicitly
search for them.

REVIEW: 117457

M  +15   -5    CMakeLists.txt
M  +0    -9    thumbnail/CMakeLists.txt

http://commits.kde.org/kio-extras/e6793e03a3c5ac6237673378aa327bb5a4d47ff4

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e67becb..2707771 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,16 +3,26 @@ project(kio-extras)
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 =

 set(QT_MIN_VERSION "5.2.0")
-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quic=
k Concurrent Script Test)
+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS DBus Network=
 Widgets Test)
 =

 find_package(ECM 0.0.11 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_CU=
RRENT_SOURCE_DIR}/cmake")
 =

 find_package(KF5 CONFIG REQUIRED COMPONENTS
-                    DNSSD KIO Declarative Plasma KHtml KDE4Support)
-
-find_package(KF5 CONFIG REQUIRED COMPONENTS SysGuard)
-find_package(KWinDBusInterface CONFIG REQUIRED)
+    Archive
+    Config
+    ConfigWidgets
+    CoreAddons
+    DBusAddons
+    DocTools
+    DNSSD
+    IconThemes
+    I18n
+    KIO
+    KHtml
+    KDE4Support
+    Solid
+)
 =

 include(KDEInstallDirs)
 include(KDECMakeSettings)
diff --git a/thumbnail/CMakeLists.txt b/thumbnail/CMakeLists.txt
index 97fdbb0..f3733d4 100644
--- a/thumbnail/CMakeLists.txt
+++ b/thumbnail/CMakeLists.txt
@@ -33,17 +33,12 @@ set(kio_thumbnail_PART_SRCS thumbnail.cpp imagefilter.c=
pp)
 =

 add_library(kio_thumbnail MODULE ${kio_thumbnail_PART_SRCS})
 =

-#target_link_libraries(kio_thumbnail ${KIO_LIBRARIES})
 target_link_libraries(kio_thumbnail
-	Qt5::Script
 	KF5::CoreAddons
 	KF5::KIOCore
 	KF5::KIOWidgets
 	KF5::Solid
-	KF5::WindowSystem
-	KF5::Plasma
 	KF5::IconThemes
-	KF5::Declarative
  	KF5::I18n
 	KF5::KDE4Support
 )
@@ -57,14 +52,10 @@ set(imagethumbnail_PART_SRCS imagecreator.cpp)
 add_library(imagethumbnail MODULE ${imagethumbnail_PART_SRCS})
 =

 target_link_libraries(imagethumbnail
-	Qt5::Script
 	KF5::CoreAddons
 	KF5::KIOCore
 	KF5::KIOWidgets
-	KF5::WindowSystem
 	KF5::Solid
-	KF5::Declarative
- 	KF5::Plasma
  	KF5::KDE4Support
  	KF5::I18n
 )
[prev in list] [next in list] [prev in thread] [next in thread]