kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Re-enable kwayland with Qt 6

Browse source
This commit is contained in:
Ilya Fedin 2021-10-25 07:35:28 +04:00 • committed by John Preston
parent 5ff43f9c51
commit 04de294533
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
external/CMakeLists.txt vendored
View file

@ -43,7 +43,7 @@ if (LINUX)
add_checked_subdirectory(jemalloc) add_checked_subdirectory(jemalloc)
endif() endif()
add_checked_subdirectory(jpeg) add_checked_subdirectory(jpeg)
if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION AND NOT DESKTOP_APP_QT6) if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
add_checked_subdirectory(kwayland) add_checked_subdirectory(kwayland)
endif() endif()
add_checked_subdirectory(lz4) add_checked_subdirectory(lz4)

8
external/kwayland/CMakeLists.txt vendored
View file

@ -25,11 +25,17 @@ else()
/usr/local/include/KF5/KWayland/Client /usr/local/include/KF5/KWayland/Client
) )
if (DESKTOP_APP_QT6)
set(qtconcurrent_loc ${qt_loc}/lib/libQt6Concurrent.a)
else()
set(qtconcurrent_loc ${qt_loc}/lib/libQt5Concurrent.a)
endif()
target_link_libraries(external_kwayland target_link_libraries(external_kwayland
INTERFACE INTERFACE
desktop-app::linux_wayland_helper desktop-app::linux_wayland_helper
$<TARGET_FILE:desktop-app::linux_wayland_helper> $<TARGET_FILE:desktop-app::linux_wayland_helper>
${qt_loc}/lib/libQt5Concurrent.a ${qtconcurrent_loc}
desktop-app::external_qt desktop-app::external_qt
) )
endif() endif()