mirrors/libtdesktopenvironment
1
0
Fork 0
mirror of https://github.com/theCheeseboard/libtdesktopenvironment.git synced 2025-01-22 10:22:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move Wayland protocols to Wayland plugin

Browse source
This commit is contained in:
Victor Tran 2023-10-09 21:58:48 +11:00
parent 0b21057643
commit 94919401e7
No known key found for this signature in database
10 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitmodules vendored
View file

@ -1,6 +1,6 @@
[submodule "lib/wayland-protocols/wayland-protocols"]
path = lib/wayland-protocols/wayland-protocols
path = plugins/wayland/wayland-protocols/wayland-protocols
url = https://gitlab.freedesktop.org/wayland/wayland-protocols.git
[submodule "lib/wayland-protocols/wlr-protocols"]
path = lib/wayland-protocols/wlr-protocols
path = plugins/wayland/wayland-protocols/wlr-protocols
url = https://gitlab.freedesktop.org/wlroots/wlr-protocols.git

4
lib/CMakeLists.txt
View file

@ -145,8 +145,4 @@ install(TARGETS libtdesktopenvironment
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(DIRECTORY wayland-protocols/tdesktopenvironment-protocols
DESTINATION ${CMAKE_INSTALL_DATADIR}/libtdesktopenvironment/wayland-protocols
)
cntp_mark_support_library_directory()

7
plugins/wayland/CMakeLists.txt
View file

@ -41,8 +41,11 @@ else()
tdesktopenvironment_register_wayland_protocol_extension(plugin-${PLUGIN_NAME} FILES
../../lib/wayland-protocols/wlr-protocols/unstable/wlr-foreign-toplevel-management-unstable-v1.xml
../../lib/wayland-protocols/tdesktopenvironment-protocols/tdesktopenvironment-keygrab-v1.xml
../../lib/wayland-protocols/tdesktopenvironment-protocols/tdesktopenvironment-accessibility-v1.xml
wayland-protocols/tdesktopenvironment-protocols/tdesktopenvironment-keygrab-v1.xml
wayland-protocols/tdesktopenvironment-protocols/tdesktopenvironment-accessibility-v1.xml
../../lib/wayland-protocols/wlr-protocols/unstable/wlr-output-management-unstable-v1.xml
)
install(DIRECTORY wayland-protocols/tdesktopenvironment-protocols
DESTINATION ${CMAKE_INSTALL_DATADIR}/libtdesktopenvironment/wayland-protocols
)
endif()

0
lib/wayland-protocols/tdesktopenvironment-protocols/tdesktopenvironment-accessibility-v1.xml → plugins/wayland/wayland-protocols/tdesktopenvironment-protocols/tdesktopenvironment-accessibility-v1.xml
View file

0
lib/wayland-protocols/tdesktopenvironment-protocols/tdesktopenvironment-keygrab-v1.xml → plugins/wayland/wayland-protocols/tdesktopenvironment-protocols/tdesktopenvironment-keygrab-v1.xml
View file

0
lib/wayland-protocols/tdesktopenvironment-protocols/wlr-layer-shell-unstable-v1.xml → plugins/wayland/wayland-protocols/tdesktopenvironment-protocols/wlr-layer-shell-unstable-v1.xml
View file

0
lib/wayland-protocols/wayland-protocols → plugins/wayland/wayland-protocols/wayland-protocols
View file

0
lib/wayland-protocols/wlr-protocols → plugins/wayland/wayland-protocols/wlr-protocols
View file

2
wayland-layer-shell/client-lib/CMakeLists.txt
View file

@ -31,7 +31,7 @@ set(PRIVATE_HEADERS
add_library(tdesktopenvironment-wayland-layer-shell-client-lib SHARED ${SOURCES} ${HEADERS} ${PRIVATE_HEADERS})
cntp_init(tdesktopenvironment-wayland-layer-shell-client-lib 20)
tdesktopenvironment_register_wayland_protocol_extension(tdesktopenvironment-wayland-layer-shell-client-lib FILES
../../lib/wayland-protocols/tdesktopenvironment-protocols/wlr-layer-shell-unstable-v1.xml
../../plugins/wayland/wayland-protocols/tdesktopenvironment-protocols/wlr-layer-shell-unstable-v1.xml
../../lib/wayland-protocols/wayland-protocols/stable/xdg-shell/xdg-shell.xml
)
set_target_properties(tdesktopenvironment-wayland-layer-shell-client-lib PROPERTIES

2
wayland-layer-shell/qt-plugin/CMakeLists.txt
View file

@ -26,7 +26,7 @@ cntp_sourcelist(
add_library(tdesktopenvironment-wayland-shell-qt-plugin SHARED ${SOURCES} ${HEADERS})
cntp_init(tdesktopenvironment-wayland-shell-qt-plugin 20)
tdesktopenvironment_register_wayland_protocol_extension(tdesktopenvironment-wayland-shell-qt-plugin FILES
../../lib/wayland-protocols/tdesktopenvironment-protocols/wlr-layer-shell-unstable-v1.xml
../../plugins/wayland/wayland-protocols/tdesktopenvironment-protocols/wlr-layer-shell-unstable-v1.xml
../../lib/wayland-protocols/wayland-protocols/stable/xdg-shell/xdg-shell.xml
)
set_target_properties(tdesktopenvironment-wayland-shell-qt-plugin PROPERTIES