Skip to content

Commit

Permalink
Use version-less Qt targets and functions whenever possible
Browse files Browse the repository at this point in the history
  • Loading branch information
ilya-fedin authored and john-preston committed Aug 9, 2022
1 parent ef8dfc2 commit 37fab6b
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -284,16 +284,12 @@ elseif (LINUX)
endif()

if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
if (DESKTOP_APP_QT6)
qt6_generate_wayland_protocol_client_sources(lib_base
FILES
${third_party_loc}/wayland-protocols/staging/xdg-activation/xdg-activation-v1.xml
${third_party_loc}/wayland-protocols/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml
${third_party_loc}/wayland-protocols/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml
)
else()
message(FATAL_ERROR "This piece of cmake code is not ported to Qt 5")
endif()
qt_generate_wayland_protocol_client_sources(lib_base
FILES
${third_party_loc}/wayland-protocols/staging/xdg-activation/xdg-activation-v1.xml
${third_party_loc}/wayland-protocols/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml
${third_party_loc}/wayland-protocols/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml
)

target_link_libraries(lib_base
PUBLIC
Expand Down

0 comments on commit 37fab6b

Please sign in to comment.