kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Fix static build without Wayland

Browse source
This commit is contained in:
Ilya Fedin 2021-10-21 10:45:33 +04:00 • committed by John Preston
parent 993e1e052e
commit 8540bd0b60
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
external/qt/CMakeLists.txt vendored
View file

@ -42,7 +42,7 @@ if (DESKTOP_APP_USE_PACKAGED)
) )
endif() endif()
if (Qt5WaylandClient_FOUND) if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_link_libraries(external_qt INTERFACE Qt5::WaylandClient) target_link_libraries(external_qt INTERFACE Qt5::WaylandClient)
target_include_directories(external_qt SYSTEM target_include_directories(external_qt SYSTEM
@ -80,7 +80,7 @@ else()
) )
endif() endif()
if (Qt5WaylandClient_FOUND) if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_include_directories(external_qt SYSTEM target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
${qt_loc}/include/QtWaylandClient ${qt_loc}/include/QtWaylandClient
@ -115,7 +115,7 @@ else()
) )
endif() endif()
if (Qt5WaylandClient_FOUND) if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_compile_definitions(external_qt target_compile_definitions(external_qt
INTERFACE INTERFACE
QT_WAYLANDCLIENT_LIB QT_WAYLANDCLIENT_LIB
@ -206,7 +206,7 @@ else()
endif() endif()
set(qt_libs_waylandclient) set(qt_libs_waylandclient)
set(qt_libs_waylandclient_plugins) 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 lib/${qt_lib_prefix}Qt5WaylandClient)
set(qt_libs_waylandclient_plugins set(qt_libs_waylandclient_plugins
plugins/platforms/${qt_lib_prefix}qwayland-generic plugins/platforms/${qt_lib_prefix}qwayland-generic
@ -281,7 +281,7 @@ else()
xcb-keysyms xcb-keysyms
z z
) )
if (Qt5WaylandClient_FOUND) if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_link_libraries(external_qt target_link_libraries(external_qt
INTERFACE INTERFACE
desktop-app::linux_wayland_helper desktop-app::linux_wayland_helper

10
external/qt/qt6/CMakeLists.txt vendored
View file

@ -30,7 +30,7 @@ if (DESKTOP_APP_USE_PACKAGED)
target_link_libraries(external_qt INTERFACE Qt6::DBus) target_link_libraries(external_qt INTERFACE Qt6::DBus)
endif() endif()
if (Qt6WaylandClient_FOUND) if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_link_libraries(external_qt INTERFACE Qt6::WaylandClient) target_link_libraries(external_qt INTERFACE Qt6::WaylandClient)
target_include_directories(external_qt SYSTEM target_include_directories(external_qt SYSTEM
@ -62,7 +62,7 @@ else()
) )
endif() endif()
if (Qt6WaylandClient_FOUND) if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_include_directories(external_qt SYSTEM target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
${qt_loc}/include/QtWaylandClient ${qt_loc}/include/QtWaylandClient
@ -93,7 +93,7 @@ else()
) )
endif() endif()
if (Qt6WaylandClient_FOUND) if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_compile_definitions(external_qt target_compile_definitions(external_qt
INTERFACE INTERFACE
QT_WAYLANDCLIENT_LIB QT_WAYLANDCLIENT_LIB
@ -178,7 +178,7 @@ else()
endif() endif()
set(qt_libs_waylandclient) set(qt_libs_waylandclient)
set(qt_libs_waylandclient_plugins) set(qt_libs_waylandclient_plugins)
if (Qt6WaylandClient_FOUND) if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
set(qt_libs_waylandclient set(qt_libs_waylandclient
lib/${qt_lib_prefix}Qt6WaylandEglClientHwIntegration lib/${qt_lib_prefix}Qt6WaylandEglClientHwIntegration
lib/${qt_lib_prefix}Qt6WaylandClient lib/${qt_lib_prefix}Qt6WaylandClient
@ -252,7 +252,7 @@ else()
xcb-keysyms xcb-keysyms
z z
) )
if (Qt6WaylandClient_FOUND) if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_link_libraries(external_qt target_link_libraries(external_qt
INTERFACE INTERFACE
desktop-app::linux_wayland_helper desktop-app::linux_wayland_helper