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

List:       kde-commits
Subject:    [plasma-desktop] /: Improve XCB dependency handling
From:       Martin_Gräßlin <mgraesslin () kde ! org>
Date:       2014-04-25 11:29:46
Message-ID: E1WdeKA-0003Sl-1K () scm ! kde ! org
[Download RAW message or body]

Git commit 7909afc68e59c3b892eccfbe0071d75bfdcb581a by Martin Gräßlin.
Committed on 25/04/2014 at 07:55.
Pushed by graesslin into branch 'master'.

Improve XCB dependency handling

* Only find what is really needed
* XCB-XKB as optional dependency for the keyboard kcm

REVIEW: 117762

M  +7    -3    CMakeLists.txt
M  +1    -1    kcms/CMakeLists.txt
M  +1    -1    kcms/input/CMakeLists.txt
M  +2    -2    kcms/kfontinst/lib/CMakeLists.txt

http://commits.kde.org/plasma-desktop/7909afc68e59c3b892eccfbe0071d75bfdcb581a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c548c0e..5d2b25e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,10 +75,14 @@ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
                         PURPOSE "Required for building the X11 based workspace"
                       )
 if(X11_FOUND)
-  find_package(XCB REQUIRED COMPONENTS XCB XFIXES DAMAGE COMPOSITE SHAPE SYNC RENDER \
RANDR KEYSYMS IMAGE SHM XTEST XKB) +  find_package(XCB
+    REQUIRED COMPONENTS
+        XCB SHM IMAGE
+    OPTIONAL_COMPONENTS
+        XKB
+  )
   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") +  add_feature_info("XCB-XKB" XCB_XKB_FOUND "Required for \
building kcm/keyboard")  endif()
 
 include_directories("${CMAKE_CURRENT_BINARY_DIR}")
diff --git a/kcms/CMakeLists.txt b/kcms/CMakeLists.txt
index 3b21c2f..c79a90a 100644
--- a/kcms/CMakeLists.txt
+++ b/kcms/CMakeLists.txt
@@ -12,7 +12,7 @@ set_package_properties(Freetype PROPERTIES DESCRIPTION "A font \
rendering engine"  
 set(libkxftconfig_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/fonts/kxftconfig.cpp )
 
-if(X11_Xkb_FOUND)
+if(X11_Xkb_FOUND AND XCB_XKB_FOUND)
     add_subdirectory( keyboard )
 endif()
 
diff --git a/kcms/input/CMakeLists.txt b/kcms/input/CMakeLists.txt
index 1257b80..1797b01 100644
--- a/kcms/input/CMakeLists.txt
+++ b/kcms/input/CMakeLists.txt
@@ -93,7 +93,7 @@ target_link_libraries(kcm_cursortheme
     KF5::KDELibs4Support
     KF5::NewStuff
     ${X11_LIBRARIES}
-    ${XCB_XCB_LIBRARY}
+    XCB::XCB
 )
 
 if (X11_Xcursor_FOUND)
diff --git a/kcms/kfontinst/lib/CMakeLists.txt b/kcms/kfontinst/lib/CMakeLists.txt
index a133956..d174596 100644
--- a/kcms/kfontinst/lib/CMakeLists.txt
+++ b/kcms/kfontinst/lib/CMakeLists.txt
@@ -9,8 +9,8 @@ target_link_libraries(kfontinst
     KF5::KDELibs4Support
     ${FREETYPE_LIBRARIES}
     ${FONTCONFIG_LIBRARIES}
-    ${XCB_XCB_LIBRARY}
-    ${XCB_IMAGE_LIBRARY}
+    XCB::XCB
+    XCB::IMAGE
 )
 set_target_properties(kfontinst PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION \
${GENERIC_LIB_SOVERSION} )  


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