Switch WaylandClient platform plugins to target check
Just like DBus and WaylandCompositor do
This commit is contained in:
parent
0811c5f446
commit
179fe08842
3 changed files with 4 additions and 11 deletions
|
|
@ -11,9 +11,7 @@ endif()
|
|||
if (LINUX AND NOT DESKTOP_APP_USE_PACKAGED)
|
||||
add_subdirectory(linux_xcb_helper)
|
||||
endif()
|
||||
if (LINUX
|
||||
AND NOT DESKTOP_APP_USE_PACKAGED
|
||||
AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
|
||||
if (LINUX AND NOT DESKTOP_APP_USE_PACKAGED)
|
||||
add_subdirectory(linux_wayland_helper)
|
||||
endif()
|
||||
if (DESKTOP_APP_USE_ALLOCATION_TRACER)
|
||||
|
|
|
|||
4
external/qt/CMakeLists.txt
vendored
4
external/qt/CMakeLists.txt
vendored
|
|
@ -220,7 +220,7 @@ else()
|
|||
$<TARGET_OBJECTS:Qt${QT_VERSION_MAJOR}::QXdgDesktopPortalThemePlugin_init>
|
||||
)
|
||||
endif()
|
||||
if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
|
||||
if (TARGET Qt::WaylandClient)
|
||||
list(PREPEND qt_libs
|
||||
plugins/platforms/${qt_lib_prefix}qwayland-generic
|
||||
plugins/platforms/${qt_lib_prefix}qwayland-egl
|
||||
|
|
@ -305,7 +305,7 @@ if (LINUX)
|
|||
xcb-render-util
|
||||
xcb-keysyms
|
||||
)
|
||||
if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
|
||||
if (TARGET Qt::WaylandClient)
|
||||
target_link_libraries(external_qt
|
||||
INTERFACE
|
||||
desktop-app::linux_wayland_helper
|
||||
|
|
|
|||
7
external/qt/package.cmake
vendored
7
external/qt/package.cmake
vendored
|
|
@ -48,12 +48,7 @@ endif()
|
|||
cmake_dependent_option(DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION "Disable all code for Wayland integration." OFF "LINUX; qt_version_6_5_or_greater" ON)
|
||||
|
||||
if (LINUX)
|
||||
if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
|
||||
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS WaylandClient REQUIRED)
|
||||
find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS WaylandCompositor QUIET)
|
||||
endif()
|
||||
|
||||
find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS DBus QUIET)
|
||||
find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS DBus WaylandClient WaylandCompositor QUIET)
|
||||
endif()
|
||||
|
||||
set_property(GLOBAL PROPERTY AUTOGEN_SOURCE_GROUP "(gen)")
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue