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

List:       kde-commits
Subject:    [kde-workspace] khotkeys: X11 is required for khotkeys
From:       Àlex_Fiestas <afiestas () kde ! org>
Date:       2014-03-21 11:02:08
Message-ID: E1WQxDE-0008D3-IN () scm ! kde ! org
[Download RAW message or body]

Git commit 2f4a26b70848230e25a5b685fa46d0e48a743f17 by =C3=80lex Fiestas.
Committed on 21/03/2014 at 10:21.
Pushed by afiestas into branch 'master'.

X11 is required for khotkeys

M  +1    -12   khotkeys/CMakeLists.txt

http://commits.kde.org/kde-workspace/2f4a26b70848230e25a5b685fa46d0e48a743f=
17

diff --git a/khotkeys/CMakeLists.txt b/khotkeys/CMakeLists.txt
index 3de3a66..57d6302 100644
--- a/khotkeys/CMakeLists.txt
+++ b/khotkeys/CMakeLists.txt
@@ -35,18 +35,7 @@ find_package(KF5 CONFIG REQUIRED COMPONENTS
     KCMUtils
 )
 =

-find_package(X11)
-set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
-                        URL "http://www.x.org"
-                        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()
+find_package(X11 REQUIRED)
 =

 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]