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

List:       kde-commits
Subject:    [plasma-workspace] /: Clean up dependencies after removal of the screenlocker
From:       Heiko Becker <heirecka () exherbo ! org>
Date:       2015-11-06 8:09:12
Message-ID: E1Zuc5A-0000f1-On () scm ! kde ! org
[Download RAW message or body]

Git commit ad906e3c4ec6d5ad2ca4d1fdf88dc66a1cf169a7 by Heiko Becker.
Committed on 06/11/2015 at 08:07.
Pushed by heikobecker into branch 'master'.

Clean up dependencies after removal of the screenlocker

4414b99dcab460ffebdc40e6d1acfcc212908fab moved the screenlocker to its
own repo. These dependencies don't seem to be used anymore because of
this.

REVIEW: 125964

M  +2    -9    CMakeLists.txt
M  +0    -3    config-X11.h.cmake
M  +0    -3    config-workspace.h.cmake

http://commits.kde.org/plasma-workspace/ad906e3c4ec6d5ad2ca4d1fdf88dc66a1cf169a7


diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0cdbf05..4783a78 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,14 +73,12 @@ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 \
                libraries"
                         PURPOSE "Required for building the X11 based \
workspace")  
 if(X11_FOUND)
-  find_package(XCB MODULE REQUIRED COMPONENTS XCB KEYSYMS)
+  find_package(XCB MODULE REQUIRED COMPONENTS XCB)
   set_package_properties(XCB PROPERTIES TYPE REQUIRED)
   if(NOT X11_SM_FOUND)
     message(FATAL_ERROR "\nThe X11 Session Management (SM) development \
package could not be found.\nPlease install libSM.\n")  endif(NOT \
X11_SM_FOUND)  
-  add_feature_info("XInput" X11_Xinput_FOUND "Required for grabbing \
                XInput2 devices in the screen locker")
-
   find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras)
 endif()
 
@@ -91,12 +89,7 @@ endif()
 find_package(KF5Wayland CONFIG)
 set_package_properties(KF5Wayland PROPERTIES
                        TYPE REQUIRED
-                       PURPOSE "Required for building screenlocker")
-find_package(WaylandScanner)
-find_package(Wayland 1.3 COMPONENTS Client Server)
-set_package_properties(Wayland PROPERTIES
-                       TYPE REQUIRED
-                       PURPOSE "Required for building screenlocker")
+                       PURPOSE "Required for Wayland integration of \
plasmashell")  
 include(ConfigureChecks.cmake)
 
diff --git a/config-X11.h.cmake b/config-X11.h.cmake
index 0da0f47..60286dd 100644
--- a/config-X11.h.cmake
+++ b/config-X11.h.cmake
@@ -42,6 +42,3 @@
 
 /* Define if you have X11 at all */
 #define HAVE_X11 ${X11_FOUND}
-
-/* Define if you have the XInput extension */
-#cmakedefine X11_Xinput_FOUND 1
\ No newline at end of file
diff --git a/config-workspace.h.cmake b/config-workspace.h.cmake
index 4b490a7..728e207 100644
--- a/config-workspace.h.cmake
+++ b/config-workspace.h.cmake
@@ -119,9 +119,6 @@
 /* Define to 1 if you have the `vsnprintf' function. */
 #cmakedefine HAVE_VSNPRINTF 1
 
-/* Define to 1 if you have the Wayland libraries. */
-#cmakedefine WAYLAND_FOUND 1
-
 /* KDE's default home directory */
 #cmakedefine KDE_DEFAULT_HOME "${KDE_DEFAULT_HOME}"
 


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