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

List:       kde-commits
Subject:    [kinfocenter] /: Minor dependencies cleanup
From:       Hrvoje Senjan <hrvoje.senjan () gmail ! com>
Date:       2014-04-10 0:39:53
Message-ID: E1WY321-0003bm-Sx () scm ! kde ! org
[Download RAW message or body]

Git commit 189dd4b9e92d2f8fea8e0849b337b5be4d7eb738 by Hrvoje Senjan.
Committed on 10/04/2014 at 00:37.
Pushed by hrvojes into branch 'master'.

Minor dependencies cleanup

1) QtGui is needed to determine openGL implementation (GL vs GL ES)
2) Completion, Config and KIO are explicit link targets so search for them
3) DocTools are needed for doc dir
4) Zlib and XCB:: are not needed
5) Only Wayland Client is needed
6) Added minor description improvements

REVIEW: 117463

M  +8    -20   CMakeLists.txt

http://commits.kde.org/kinfocenter/189dd4b9e92d2f8fea8e0849b337b5be4d7eb738

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 869e65a..aa929e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,12 +11,14 @@ include(KDECMakeSettings)
 include(KDECompilerSettings)
 include(FeatureSummary)
 =

-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
-    Core
-)
+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui)
 =

 find_package(KF5 CONFIG REQUIRED COMPONENTS
+    Completion
+    Config
     I18n
+    DocTools
+    KIO
     XmlGui
     KDE4Support
     WindowSystem
@@ -26,12 +28,6 @@ find_package(KF5 CONFIG REQUIRED COMPONENTS
     Plasma
 )
 =

-find_package(ZLIB)
-set_package_properties(ZLIB PROPERTIES DESCRIPTION "Support for gzip compr=
essed files and data streams"
-                       URL "http://www.zlib.net"
-                       TYPE REQUIRED
-                      )
-
 find_package(OpenGL)
 set_package_properties(OpenGL PROPERTIES DESCRIPTION "The OpenGL libraries"
                        URL "http://www.opengl.org"
@@ -46,16 +42,14 @@ set_package_properties(OpenGLES PROPERTIES DESCRIPTION =
"The OpenGLES libraries"
 find_package(EGL)
 set_package_properties(EGL PROPERTIES
                        TYPE OPTIONAL
-                       PURPOSE "Required to build KWin with EGL support"
+                       PURPOSE "Required for OpenGL Information Module"
                       )
 =

-find_package(Wayland 1.2 COMPONENTS Client Egl Cursor)
+find_package(Wayland 1.2 COMPONENTS Client)
 set_package_properties(Wayland PROPERTIES
                        TYPE OPTIONAL
-                       PURPOSE "Required for building KWin with Wayland su=
pport"
                       )
-add_feature_info("Wayland-Client" Wayland_Client_FOUND "Required for build=
ing the Wayland backend in KWin")
-add_feature_info("Wayland-EGL" Wayland_Egl_FOUND "Required for building th=
e Wayland EGL compositing backend in KWin")
+add_feature_info("Wayland-Client" Wayland_Client_FOUND "Required for Wayla=
nd Compositor Information Module")
 =

 find_package(X11)
 set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
@@ -63,12 +57,6 @@ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 l=
ibraries"
                         TYPE OPTIONAL
                         PURPOSE "Required for building the X11 based works=
pace"
                       )
-if(X11_FOUND)
-  find_package(XCB REQUIRED COMPONENTS XCB XFIXES DAMAGE COMPOSITE SHAPE S=
YNC RENDER RANDR KEYSYMS IMAGE SHM XTEST)
-  set_package_properties(XCB PROPERTIES TYPE REQUIRED)
-  find_package(XCB COMPONENTS ICCCM)
-  add_feature_info("XCB-ICCCM" XCB_ICCCM_FOUND "Required for building test=
 applications for KWin")
-endif()
 =

 configure_file(config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config=
-workspace.h)
 configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
[prev in list] [next in list] [prev in thread] [next in thread]