From 52ebf31d2b97513b2e3f9b46c99e60249d2b61fe Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 19 Aug 2022 07:51:38 +0000 Subject: [PATCH] CMake: don't use full paths for X11 SM and ICE libs Full paths were recorded into INTERFACE_LINK_LIBRARIES which could point to temporary build directories. Pick-to: 6.4 6.3 6.2 Change-Id: I883fd8f652e4d9ecd7d8e0076d62f5c7f4e14ec9 Reviewed-by: Alexandru Croitor --- src/gui/configure.cmake | 2 +- src/plugins/platforms/xcb/CMakeLists.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index 8a338799a9..d29ffec8b9 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -65,7 +65,7 @@ if((X11_SUPPORTED) OR QT_FIND_ALL_PACKAGES_ALWAYS) qt_find_package(X11 PROVIDED_TARGETS X11::X11 MODULE_NAME gui QMAKE_LIB xlib) endif() if((X11_SUPPORTED) OR QT_FIND_ALL_PACKAGES_ALWAYS) - qt_find_package(X11 PROVIDED_TARGETS ${X11_SM_LIB} ${X11_ICE_LIB} MODULE_NAME gui QMAKE_LIB x11sm) + qt_find_package(X11 PROVIDED_TARGETS X11::SM X11::ICE MODULE_NAME gui QMAKE_LIB x11sm) endif() if((X11_SUPPORTED) OR QT_FIND_ALL_PACKAGES_ALWAYS) qt_find_package(XCB 1.11 PROVIDED_TARGETS XCB::XCB MODULE_NAME gui QMAKE_LIB xcb) diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index b4dab95eb9..76d16ee555 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -100,7 +100,8 @@ qt_internal_extend_target(XcbQpaPrivate CONDITION QT_FEATURE_xcb_sm SOURCES qxcbsessionmanager.cpp qxcbsessionmanager.h PUBLIC_LIBRARIES - ${X11_SM_LIB} ${X11_ICE_LIB} + X11::SM + X11::ICE ) qt_internal_extend_target(XcbQpaPrivate CONDITION QT_FEATURE_vulkan