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 <[email protected]>
zoldalis · Aug 24, 2022 · 52ebf31 · 52ebf31
1 parent da9d60e
commit 52ebf31
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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