yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop X11_XCB library dependency

Browse source 
We don't need it anymore - the xcb connection is also provided by
QX11Info.
This commit is contained in:
Martin Gräßlin 2013-07-23 12:46:04 +02:00
parent 919510f1a1
commit 9ab751042a
6 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -247,7 +247,6 @@ set(kwin_XLIB_LIBS
set(kwin_XCB_LIBS set(kwin_XCB_LIBS
${XCB_XCB_LIBRARIES} ${XCB_XCB_LIBRARIES}
${X11_XCB_LIBRARIES}
${XCB_XFIXES_LIBRARIES} ${XCB_XFIXES_LIBRARIES}
${XCB_DAMAGE_LIBRARIES} ${XCB_DAMAGE_LIBRARIES}
${XCB_COMPOSITE_LIBRARIES} ${XCB_COMPOSITE_LIBRARIES}

1
effects/CMakeLists.txt
View file

@ -19,7 +19,6 @@ set(kwin_effect_XLIB_LIBS
set(kwin_effect_XCB_LIBS set(kwin_effect_XCB_LIBS
${XCB_XCB_LIBRARIES} ${XCB_XCB_LIBRARIES}
${X11_XCB_LIBRARIES}
${XCB_IMAGE_LIBRARIES} ${XCB_IMAGE_LIBRARIES}
${XCB_XFIXES_LIBRARIES} ${XCB_XFIXES_LIBRARIES}
) )

1
kcmkwin/kwinrules/CMakeLists.txt
View file

@ -13,7 +13,6 @@ kde4_add_kdeinit_executable( kwin_rules_dialog ${kwin_rules_dialog_KDEINIT_SRCS}
set(kwin_kcm_rules_XCB_LIBS set(kwin_kcm_rules_XCB_LIBS
${XCB_XCB_LIBRARIES} ${XCB_XCB_LIBRARIES}
${X11_XCB_LIBRARIES}
) )
target_link_libraries(kdeinit_kwin_rules_dialog ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${KACTIVITIES_LIBRARY} ${kwin_kcm_rules_XCB_LIBS}) target_link_libraries(kdeinit_kwin_rules_dialog ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${KACTIVITIES_LIBRARY} ${kwin_kcm_rules_XCB_LIBS})

1
libkwineffects/CMakeLists.txt
View file

@ -29,7 +29,6 @@ set(kwineffects_XLIB_LIBS
set(kwineffects_XCB_LIBS set(kwineffects_XCB_LIBS
${XCB_XCB_LIBRARIES} ${XCB_XCB_LIBRARIES}
${X11_XCB_LIBRARIES}
${XCB_XFIXES_LIBRARIES} ${XCB_XFIXES_LIBRARIES}
${XCB_RENDER_LIBRARIES} ${XCB_RENDER_LIBRARIES}
) )

3
libkwineffects/kwinglobals.h
View file

@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <kdemacros.h> #include <kdemacros.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xlib-xcb.h>
#include <fixx11h.h> #include <fixx11h.h>
#include <xcb/xcb.h> #include <xcb/xcb.h>
@ -127,7 +126,7 @@ KWIN_EXPORT xcb_connection_t *connection()
{ {
static xcb_connection_t *s_con = NULL; static xcb_connection_t *s_con = NULL;
if (!s_con) { if (!s_con) {
s_con = XGetXCBConnection(display()); s_con = QX11Info::connection();
} }
return s_con; return s_con;
} }

3
tests/CMakeLists.txt
View file

@ -56,7 +56,6 @@ target_link_libraries( testClientMachine
KF5::KWindowSystem KF5::KWindowSystem
${XCB_XCB_LIBRARIES} ${XCB_XCB_LIBRARIES}
${XCB_XFIXES_LIBRARIES} ${XCB_XFIXES_LIBRARIES}
${X11_XCB_LIBRARIES}
${X11_X11_LIB} # to make jenkins happy ${X11_X11_LIB} # to make jenkins happy
${X11_Xcursor_LIB} ${X11_Xcursor_LIB}
) )
@ -74,7 +73,6 @@ target_link_libraries( testXcbWrapper
${Qt5X11Extras_LIBRARIES} ${Qt5X11Extras_LIBRARIES}
${Qt5Widgets_LIBRARIES} ${Qt5Widgets_LIBRARIES}
${XCB_XCB_LIBRARIES} ${XCB_XCB_LIBRARIES}
${X11_XCB_LIBRARIES}
) )
######################################################## ########################################################
@ -90,5 +88,4 @@ target_link_libraries( testXcbWindow
${Qt5X11Extras_LIBRARIES} ${Qt5X11Extras_LIBRARIES}
${Qt5Widgets_LIBRARIES} ${Qt5Widgets_LIBRARIES}
${XCB_XCB_LIBRARIES} ${XCB_XCB_LIBRARIES}
${X11_XCB_LIBRARIES}
) )