diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-08-19 07:51:38 +0000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-24 19:12:13 +0000 |
| commit | ba31e6eab84c7dfec6c47f7ff064425d22b41153 (patch) | |
| tree | 15ba4a49a112d72f9ca38469fa81aa55b36dde2c | |
| parent | ef332580acad7b8100855cb4baa6e0760cb45718 (diff) | |
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.
Change-Id: I883fd8f652e4d9ecd7d8e0076d62f5c7f4e14ec9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 52ebf31d2b97513b2e3f9b46c99e60249d2b61fe)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/gui/configure.cmake | 2 | ||||
| -rw-r--r-- | 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 42ab041f99..60e2a80185 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -62,7 +62,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 c73b2de73f..bb026e77e8 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -97,7 +97,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 |