From caad13ff9592d3287804ffa56b01f511d1b5ebad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Wed, 4 Sep 2013 09:36:20 +0200 Subject: [PATCH] Use new components based Find XCB --- CMakeLists.txt | 22 +++++++++++----------- effects/CMakeLists.txt | 6 +++--- libkwineffects/CMakeLists.txt | 6 +++--- tests/CMakeLists.txt | 8 ++++---- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 37d5ccc54d..198d60abfa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -254,22 +254,22 @@ set(kwin_XLIB_LIBS ) set(kwin_XCB_LIBS - ${XCB_XCB_LIBRARIES} - ${XCB_XFIXES_LIBRARIES} - ${XCB_DAMAGE_LIBRARIES} - ${XCB_COMPOSITE_LIBRARIES} - ${XCB_SHAPE_LIBRARIES} - ${XCB_SYNC_LIBRARIES} - ${XCB_RENDER_LIBRARIES} - ${XCB_RANDR_LIBRARIES} - ${XCB_KEYSYMS_LIBRARIES} + ${XCB_XCB_LIBRARY} + ${XCB_XFIXES_LIBRARY} + ${XCB_DAMAGE_LIBRARY} + ${XCB_COMPOSITE_LIBRARY} + ${XCB_SHAPE_LIBRARY} + ${XCB_SYNC_LIBRARY} + ${XCB_RENDER_LIBRARY} + ${XCB_RANDR_LIBRARY} + ${XCB_KEYSYMS_LIBRARY} ) set(kwin_WAYLAND_LIBS ${WAYLAND_CLIENT_LIBRARIES} ${WAYLAND_EGL_LIBRARIES} - ${XCB_SHM_LIBRARIES} - ${XCB_XTEST_LIBRARIES} + ${XCB_SHM_LIBRARY} + ${XCB_XTEST_LIBRARY} ) set(kwin_OPENGL_LIBS ) diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt index fe24163491..5fdf6150f9 100644 --- a/effects/CMakeLists.txt +++ b/effects/CMakeLists.txt @@ -25,9 +25,9 @@ set(kwin_effect_XLIB_LIBS ) set(kwin_effect_XCB_LIBS - ${XCB_XCB_LIBRARIES} - ${XCB_IMAGE_LIBRARIES} - ${XCB_XFIXES_LIBRARIES} + ${XCB_XCB_LIBRARY} + ${XCB_IMAGE_LIBRARY} + ${XCB_XFIXES_LIBRARY} ) if( KWIN_HAVE_XRENDER_COMPOSITING ) diff --git a/libkwineffects/CMakeLists.txt b/libkwineffects/CMakeLists.txt index c4cdc543c3..dcb43d3829 100644 --- a/libkwineffects/CMakeLists.txt +++ b/libkwineffects/CMakeLists.txt @@ -19,9 +19,9 @@ set(kwineffects_KDE_LIBS ) set(kwineffects_XCB_LIBS - ${XCB_XCB_LIBRARIES} - ${XCB_XFIXES_LIBRARIES} - ${XCB_RENDER_LIBRARIES} + ${XCB_XCB_LIBRARY} + ${XCB_XFIXES_LIBRARY} + ${XCB_RENDER_LIBRARY} ) kde4_add_library(kwineffects SHARED ${kwin_EFFECTSLIB_SRCS}) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 6dd0e685e0..07b863a3bc 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -55,8 +55,8 @@ target_link_libraries( testClientMachine Qt5::Widgets ${KDE4Support_LIBRARIES} # kdebug KF5::KWindowSystem - ${XCB_XCB_LIBRARIES} - ${XCB_XFIXES_LIBRARIES} + ${XCB_XCB_LIBRARY} + ${XCB_XFIXES_LIBRARY} ${X11_X11_LIB} # to make jenkins happy ${X11_Xcursor_LIB} ) @@ -73,7 +73,7 @@ target_link_libraries( testXcbWrapper Qt5::Test Qt5::X11Extras Qt5::Widgets - ${XCB_XCB_LIBRARIES} + ${XCB_XCB_LIBRARY} ) ######################################################## @@ -88,5 +88,5 @@ target_link_libraries( testXcbWindow Qt5::Test Qt5::X11Extras Qt5::Widgets - ${XCB_XCB_LIBRARIES} + ${XCB_XCB_LIBRARY} )