vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[kwin] Use imported targets for all XCB libs 

Requires 04f78489265b6e52cabd2980dfc417abeee3a695 from ECM
icc-effect-5.14.5
Martin Gräßlin 2014-02-25 15:48:39 +01:00
parent b49b631851
commit 4586767db8
9 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CMakeLists.txt
View File

@ -60,8 +60,6 @@ if(KWIN_BUILD_OPENGLES)
include_directories(${OPENGLES_INCLUDE_DIR})
endif()
include_directories(${XCB_INCLUDE_DIR})
# for things that are also used by kwin libraries
configure_file(libkwineffects/kwinconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkwineffects/kwinconfig.h )
# for kwin internal things
@ -266,21 +264,21 @@ set(kwin_XLIB_LIBS
)
set(kwin_XCB_LIBS
${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}
${XCB_SHM_LIBRARY}
XCB::XCB
XCB::XFIXES
XCB::DAMAGE
XCB::COMPOSITE
XCB::SHAPE
XCB::SYNC
XCB::RENDER
XCB::RANDR
XCB::KEYSYMS
XCB::SHM
)
set(kwin_WAYLAND_LIBS
Wayland::Client
${XCB_XTEST_LIBRARY}
XCB::XTEST
)
set(kwin_WAYLAND_EGL_LIBS

8
autotests/CMakeLists.txt
View File

@ -50,8 +50,8 @@ target_link_libraries( testClientMachine
Qt5::X11Extras
Qt5::Widgets
KF5::WindowSystem
${XCB_XCB_LIBRARY}
${XCB_XFIXES_LIBRARY}
XCB::XCB
XCB::XFIXES
${X11_X11_LIB} # to make jenkins happy
${X11_Xcursor_LIB}
)
@ -68,7 +68,7 @@ target_link_libraries( testXcbWrapper
Qt5::Test
Qt5::X11Extras
Qt5::Widgets
${XCB_XCB_LIBRARY}
XCB::XCB
)
########################################################
@ -83,5 +83,5 @@ target_link_libraries( testXcbWindow
Qt5::Test
Qt5::X11Extras
Qt5::Widgets
${XCB_XCB_LIBRARY}
XCB::XCB
)

2
clients/oxygen/CMakeLists.txt
View File

@ -31,7 +31,7 @@ target_link_libraries(kwin3_oxygen kdecorations)
target_link_libraries(kwin3_oxygen oxygenstyle)
if(X11_FOUND)
target_link_libraries(kwin3_oxygen ${XCB_XCB_LIBRARIES})
target_link_libraries(kwin3_oxygen XCB::XCB)
endif()
install(TARGETS kwin3_oxygen DESTINATION ${PLUGIN_INSTALL_DIR})

2
clients/oxygen/config/CMakeLists.txt
View File

@ -30,7 +30,7 @@ target_link_libraries(kwin_oxygen_config KF5::WindowSystem KF5::Completion)
target_link_libraries(kwin_oxygen_config kdecorations oxygenstyle oxygenstyleconfig)
if(X11_FOUND)
target_link_libraries(kwin_oxygen_config ${XCB_LIBRARIES})
target_link_libraries(kwin_oxygen_config XCB::XCB)
target_link_libraries(kwin_oxygen_config Qt5::X11Extras)
endif()

8
effects/CMakeLists.txt
View File

@ -26,13 +26,13 @@ set(kwin_effect_XLIB_LIBS
)
set(kwin_effect_XCB_LIBS
${XCB_XCB_LIBRARY}
${XCB_IMAGE_LIBRARY}
${XCB_XFIXES_LIBRARY}
XCB::XCB
XCB::IMAGE
XCB::XFIXES
)
if( KWIN_HAVE_XRENDER_COMPOSITING )
set(kwin_effect_XCB_LIBS ${kwin_effect_XCB_LIBS} ${XCB_RENDER_LIBRARIES})
set(kwin_effect_XCB_LIBS ${kwin_effect_XCB_LIBS} XCB::RENDER)
endif()
if(KWIN_BUILD_OPENGL)

4
kcmkwin/kwinrules/CMakeLists.txt
View File

@ -12,8 +12,8 @@ set(kwin_rules_dialog_KDEINIT_SRCS main.cpp ${kwinrules_SRCS})
kf5_add_kdeinit_executable( kwin_rules_dialog ${kwin_rules_dialog_KDEINIT_SRCS})
set(kwin_kcm_rules_XCB_LIBS
${XCB_XCB_LIBRARIES}
${XCB_XFIXES_LIBRARY}
XCB::XCB
XCB::XFIXES
${X11_Xcursor_LIB}
)

2
kcmkwin/kwintabbox/CMakeLists.txt
View File

@ -21,7 +21,7 @@ target_link_libraries(kcm_kwintabbox
KF5::I18n
KF5::Service
KF5::NewStuff
${XCB_XCB_LIBRARY})
XCB::XCB)
install(TARGETS kcm_kwintabbox DESTINATION ${PLUGIN_INSTALL_DIR} )

8
libkwineffects/CMakeLists.txt
View File

@ -19,9 +19,9 @@ set(kwineffects_KDE_LIBS
)
set(kwineffects_XCB_LIBS
${XCB_XCB_LIBRARY}
${XCB_XFIXES_LIBRARY}
${XCB_RENDER_LIBRARY}
XCB::XCB
XCB::XFIXES
XCB::RENDER
)
add_library(kwineffects SHARED ${kwin_EFFECTSLIB_SRCS})
@ -49,7 +49,7 @@ macro( KWIN4_ADD_GLUTILS_BACKEND name glinclude )
include_directories(${glinclude})
add_library(${name} SHARED ${kwin_GLUTILSLIB_SRCS})
generate_export_header(kwinglutils EXPORT_FILE_NAME kwinglutils_export.h)
target_link_libraries(${name} PUBLIC Qt5::DBus Qt5::X11Extras ${XCB_XCB_LIBRARY})
target_link_libraries(${name} PUBLIC Qt5::DBus Qt5::X11Extras XCB::XCB)
if(KWIN_HAVE_EGL)
target_link_libraries(${name} PRIVATE EGL::EGL)
endif()

2
tests/CMakeLists.txt
View File

@ -1,5 +1,5 @@
if (XCB_ICCCM_FOUND)
set(normalhintsbasesizetest_SRCS normalhintsbasesizetest.cpp)
add_executable(normalhintsbasesizetest ${normalhintsbasesizetest_SRCS})
target_link_libraries(normalhintsbasesizetest ${XCB_XCB_LIBRARY} ${XCB_ICCCM_LIBRARY})
target_link_libraries(normalhintsbasesizetest XCB::XCB XCB::ICCCM)
endif()