diff --git a/src/platformsupport/wayland/CMakeLists.txt b/src/platformsupport/wayland/CMakeLists.txt index 0ac09b52faa..b804531aeff 100644 --- a/src/platformsupport/wayland/CMakeLists.txt +++ b/src/platformsupport/wayland/CMakeLists.txt @@ -4,6 +4,12 @@ # Generated from src.pro. # special case begin qt_find_package(WaylandScanner PROVIDED_TARGETS Wayland::Scanner) +if(TARGET Wayland::Client) + qt_internal_disable_find_package_global_promotion(Wayland::Client) +endif() +if(TARGET Wayland::Server) + qt_internal_disable_find_package_global_promotion(Wayland::Server) +endif() qt_find_package(Wayland 1.15 PROVIDED_TARGETS Wayland::Client Wayland::Server) if (NOT WaylandScanner_FOUND OR NOT Wayland_FOUND) diff --git a/src/platformsupport/wayland/configure.cmake b/src/platformsupport/wayland/configure.cmake index 9954ea6269e..4270e819628 100644 --- a/src/platformsupport/wayland/configure.cmake +++ b/src/platformsupport/wayland/configure.cmake @@ -12,21 +12,35 @@ set(INPUT_wayland_text_input_v4_wip OFF CACHE BOOL "") if(LINUX OR QT_FIND_ALL_PACKAGES_ALWAYS) # waylandclient libraries + if(TARGET Wayland::Client) + qt_internal_disable_find_package_global_promotion(Wayland::Client) + endif() qt_find_package(Wayland PROVIDED_TARGETS Wayland::Client MODULE_NAME waylandclient QMAKE_LIB wayland-client) + + if(TARGET Wayland::Cursor) + qt_internal_disable_find_package_global_promotion(Wayland::Cursor) + endif() qt_find_package(Wayland PROVIDED_TARGETS Wayland::Cursor MODULE_NAME waylandclient QMAKE_LIB wayland-cursor) qt_add_qmake_lib_dependency(wayland-cursor wayland-client) + + if(TARGET Wayland::Egl) + qt_internal_disable_find_package_global_promotion(Wayland::Egl) + endif() qt_find_package(Wayland PROVIDED_TARGETS Wayland::Egl MODULE_NAME waylandclient QMAKE_LIB wayland-egl) # waylandcompositor libraries + if(TARGET Wayland::Server) + qt_internal_disable_find_package_global_promotion(Wayland::Server) + endif() qt_find_package(Wayland PROVIDED_TARGETS Wayland::Server MODULE_NAME waylandcompositor