[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kde-workspace] /: [kwin] Use imported targets for all XCB libs
From: Martin_Gräßlin <mgraesslin () kde ! org>
Date: 2014-02-25 14:51:48
Message-ID: E1WIJMK-0007Ug-K8 () scm ! kde ! org
[Download RAW message or body]
Git commit bb3e38c87d9b6e99199bd65ce4031f843f839c2e by Martin Gr=C3=A4=C3=
=9Flin.
Committed on 25/02/2014 at 14:48.
Pushed by graesslin into branch 'master'.
[kwin] Use imported targets for all XCB libs
Requires 04f78489265b6e52cabd2980dfc417abeee3a695 from ECM
M +1 -4 CMakeLists.txt
M +11 -13 kwin/CMakeLists.txt
M +4 -4 kwin/autotests/CMakeLists.txt
M +1 -1 kwin/clients/oxygen/CMakeLists.txt
M +1 -1 kwin/clients/oxygen/config/CMakeLists.txt
M +4 -4 kwin/effects/CMakeLists.txt
M +2 -2 kwin/kcmkwin/kwinrules/CMakeLists.txt
M +1 -1 kwin/kcmkwin/kwintabbox/CMakeLists.txt
M +4 -4 kwin/libkwineffects/CMakeLists.txt
M +1 -1 kwin/tests/CMakeLists.txt
http://commits.kde.org/kde-workspace/bb3e38c87d9b6e99199bd65ce4031f843f839c=
2e
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9942d06..2b984d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,10 +133,7 @@ set_package_properties(X11 PROPERTIES DESCRIPTION "X11=
libraries"
=
if(HAVE_X11)
find_package(XCB REQUIRED COMPONENTS XCB XFIXES DAMAGE COMPOSITE SHAPE S=
YNC RENDER RANDR KEYSYMS IMAGE SHM XTEST)
- set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language=
Binding"
- URL "http://xcb.freedesktop.org"
- TYPE REQUIRED
- )
+ 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")
=
diff --git a/kwin/CMakeLists.txt b/kwin/CMakeLists.txt
index 5747085..6280477 100644
--- a/kwin/CMakeLists.txt
+++ b/kwin/CMakeLists.txt
@@ -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_DI=
R}/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
diff --git a/kwin/autotests/CMakeLists.txt b/kwin/autotests/CMakeLists.txt
index 9c5663b..12f192d 100644
--- a/kwin/autotests/CMakeLists.txt
+++ b/kwin/autotests/CMakeLists.txt
@@ -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
)
diff --git a/kwin/clients/oxygen/CMakeLists.txt b/kwin/clients/oxygen/CMake=
Lists.txt
index d4ac9ea..bb5484a 100644
--- a/kwin/clients/oxygen/CMakeLists.txt
+++ b/kwin/clients/oxygen/CMakeLists.txt
@@ -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})
diff --git a/kwin/clients/oxygen/config/CMakeLists.txt b/kwin/clients/oxyge=
n/config/CMakeLists.txt
index d675633..ebd6066 100644
--- a/kwin/clients/oxygen/config/CMakeLists.txt
+++ b/kwin/clients/oxygen/config/CMakeLists.txt
@@ -30,7 +30,7 @@ target_link_libraries(kwin_oxygen_config KF5::WindowSyste=
m KF5::Completion)
target_link_libraries(kwin_oxygen_config kdecorations oxygenstyle oxygens=
tyleconfig)
=
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()
=
diff --git a/kwin/effects/CMakeLists.txt b/kwin/effects/CMakeLists.txt
index de85ad6..4654eec 100644
--- a/kwin/effects/CMakeLists.txt
+++ b/kwin/effects/CMakeLists.txt
@@ -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_LIBRARIE=
S})
+ set(kwin_effect_XCB_LIBS ${kwin_effect_XCB_LIBS} XCB::RENDER)
endif()
=
if(KWIN_BUILD_OPENGL)
diff --git a/kwin/kcmkwin/kwinrules/CMakeLists.txt b/kwin/kcmkwin/kwinrules=
/CMakeLists.txt
index 485b7c0..0bb5415 100644
--- a/kwin/kcmkwin/kwinrules/CMakeLists.txt
+++ b/kwin/kcmkwin/kwinrules/CMakeLists.txt
@@ -12,8 +12,8 @@ set(kwin_rules_dialog_KDEINIT_SRCS main.cpp ${kwinrules_S=
RCS})
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}
)
=
diff --git a/kwin/kcmkwin/kwintabbox/CMakeLists.txt b/kwin/kcmkwin/kwintabb=
ox/CMakeLists.txt
index e1438f4..8dfc43f 100644
--- a/kwin/kcmkwin/kwintabbox/CMakeLists.txt
+++ b/kwin/kcmkwin/kwintabbox/CMakeLists.txt
@@ -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} )
=
diff --git a/kwin/libkwineffects/CMakeLists.txt b/kwin/libkwineffects/CMake=
Lists.txt
index 6897a01..39ebf49 100644
--- a/kwin/libkwineffects/CMakeLists.txt
+++ b/kwin/libkwineffects/CMakeLists.txt
@@ -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_XC=
B_LIBRARY})
+ target_link_libraries(${name} PUBLIC Qt5::DBus Qt5::X11Extras XCB::XCB)
if(KWIN_HAVE_EGL)
target_link_libraries(${name} PRIVATE EGL::EGL)
endif()
diff --git a/kwin/tests/CMakeLists.txt b/kwin/tests/CMakeLists.txt
index 3fa16f2..5d8cb13 100644
--- a/kwin/tests/CMakeLists.txt
+++ b/kwin/tests/CMakeLists.txt
@@ -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()
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic