From 64b31cafa102c788a25a3d83975da84938a7432b Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Fri, 3 May 2019 09:46:47 +0200 Subject: [PATCH] cmake: Fix xcb_glx build Use the actual cmake library target name Change-Id: Icda1d232e3b920bf33ebceb00f39682050f7dedd Reviewed-by: Alexandru Croitor --- .../platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt | 2 +- util/cmake/helper.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt index 51e5f976589..c8212daae6f 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt @@ -38,7 +38,7 @@ add_qt_plugin(qxcb-glx-integration extend_target(qxcb-glx-integration CONDITION QT_FEATURE_xcb_glx PUBLIC_LIBRARIES - xcb_glx + XCB::GLX ) extend_target(qxcb-glx-integration CONDITION NOT static diff --git a/util/cmake/helper.py b/util/cmake/helper.py index 1e13a5a1f3e..eb30aa02ddd 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -240,6 +240,7 @@ qmake_library_to_cmake_target_mapping = { 'SQLite3': 'SQLite::SQLite3', 'tslib': 'PkgConfig::Tslib', 'x11sm': '${X11_SM_LIB} ${X11_ICE_LIB}', + 'xcb_glx': 'XCB::GLX', 'xcb_icccm': 'XCB::ICCCM', 'xcb_image': 'XCB::IMAGE', 'xcb_keysyms': 'XCB::KEYSYMS',