From 8540bd0b6007648792e700719b291f83fc75d9da Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 21 Oct 2021 10:45:33 +0400 Subject: [PATCH] Fix static build without Wayland --- external/qt/CMakeLists.txt | 10 +++++----- external/qt/qt6/CMakeLists.txt | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt index f1649ad..727db1e 100644 --- a/external/qt/CMakeLists.txt +++ b/external/qt/CMakeLists.txt @@ -42,7 +42,7 @@ if (DESKTOP_APP_USE_PACKAGED) ) endif() - if (Qt5WaylandClient_FOUND) + if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) target_link_libraries(external_qt INTERFACE Qt5::WaylandClient) target_include_directories(external_qt SYSTEM @@ -80,7 +80,7 @@ else() ) endif() - if (Qt5WaylandClient_FOUND) + if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) target_include_directories(external_qt SYSTEM INTERFACE ${qt_loc}/include/QtWaylandClient @@ -115,7 +115,7 @@ else() ) endif() - if (Qt5WaylandClient_FOUND) + if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) target_compile_definitions(external_qt INTERFACE QT_WAYLANDCLIENT_LIB @@ -206,7 +206,7 @@ else() endif() set(qt_libs_waylandclient) set(qt_libs_waylandclient_plugins) - if (Qt5WaylandClient_FOUND) + if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) set(qt_libs_waylandclient lib/${qt_lib_prefix}Qt5WaylandClient) set(qt_libs_waylandclient_plugins plugins/platforms/${qt_lib_prefix}qwayland-generic @@ -281,7 +281,7 @@ else() xcb-keysyms z ) - if (Qt5WaylandClient_FOUND) + if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) target_link_libraries(external_qt INTERFACE desktop-app::linux_wayland_helper diff --git a/external/qt/qt6/CMakeLists.txt b/external/qt/qt6/CMakeLists.txt index 294af5c..7ac5536 100644 --- a/external/qt/qt6/CMakeLists.txt +++ b/external/qt/qt6/CMakeLists.txt @@ -30,7 +30,7 @@ if (DESKTOP_APP_USE_PACKAGED) target_link_libraries(external_qt INTERFACE Qt6::DBus) endif() - if (Qt6WaylandClient_FOUND) + if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) target_link_libraries(external_qt INTERFACE Qt6::WaylandClient) target_include_directories(external_qt SYSTEM @@ -62,7 +62,7 @@ else() ) endif() - if (Qt6WaylandClient_FOUND) + if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) target_include_directories(external_qt SYSTEM INTERFACE ${qt_loc}/include/QtWaylandClient @@ -93,7 +93,7 @@ else() ) endif() - if (Qt6WaylandClient_FOUND) + if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) target_compile_definitions(external_qt INTERFACE QT_WAYLANDCLIENT_LIB @@ -178,7 +178,7 @@ else() endif() set(qt_libs_waylandclient) set(qt_libs_waylandclient_plugins) - if (Qt6WaylandClient_FOUND) + if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) set(qt_libs_waylandclient lib/${qt_lib_prefix}Qt6WaylandEglClientHwIntegration lib/${qt_lib_prefix}Qt6WaylandClient @@ -252,7 +252,7 @@ else() xcb-keysyms z ) - if (Qt6WaylandClient_FOUND) + if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) target_link_libraries(external_qt INTERFACE desktop-app::linux_wayland_helper