pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

cmake: manually run pkg-config --variable=pkgdatadir wayland-protocols

Browse source 
To get the path to the wayland protocol definitions, manually run
pkg-config with --variable=pkgdatadir.

Then use this instead of a hardcoded path into
/usr/share/wayland-protocols when defining the custom commands to
generate .c/.h files from the protocol XML definitions.
This commit is contained in:
Daniel Eklöf 2019-02-06 16:01:18 +01:00
parent da062f26d5
commit 9383142858
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
CMakeLists.txt
View file

@ -72,23 +72,28 @@ if (ENABLE_WAYLAND)
VERBATIM VERBATIM
MAIN_DEPENDENCY ${PROJECT_SOURCE_DIR}/external/wlroots/protocol/wlr-layer-shell-unstable-v1.xml MAIN_DEPENDENCY ${PROJECT_SOURCE_DIR}/external/wlroots/protocol/wlr-layer-shell-unstable-v1.xml
) )
execute_process(
COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=pkgdatadir wayland-protocols
OUTPUT_VARIABLE WAYLAND_PROTOCOLS
OUTPUT_STRIP_TRAILING_WHITESPACE)
add_custom_command( add_custom_command(
OUTPUT xdg-shell.c OUTPUT xdg-shell.c
COMMAND wayland-scanner private-code < /usr/share/wayland-protocols/stable/xdg-shell/xdg-shell.xml > xdg-shell.c COMMAND wayland-scanner private-code < ${WAYLAND_PROTOCOLS}/stable/xdg-shell/xdg-shell.xml > xdg-shell.c
VERBATIM VERBATIM
MAIN_DEPENDENCY /usr/share/wayland-protocols/stable/xdg-shell/xdg-shell.xml MAIN_DEPENDENCY ${WAYLAND_PROTOCOLS}/stable/xdg-shell/xdg-shell.xml
) )
add_custom_command( add_custom_command(
OUTPUT xdg-output-unstable-v1-client.h OUTPUT xdg-output-unstable-v1-client.h
COMMAND wayland-scanner client-header < /usr/share/wayland-protocols/unstable/xdg-output/xdg-output-unstable-v1.xml > xdg-output-unstable-v1-client.h COMMAND wayland-scanner client-header < ${WAYLAND_PROTOCOLS}/unstable/xdg-output/xdg-output-unstable-v1.xml > xdg-output-unstable-v1-client.h
VERBATIM VERBATIM
MAIN_DEPENDENCY /usr/share/wayland-protocols/unstable/xdg-output/xdg-output-unstable-v1.xml MAIN_DEPENDENCY ${WAYLAND_PROTOCOLS}/unstable/xdg-output/xdg-output-unstable-v1.xml
) )
add_custom_command( add_custom_command(
OUTPUT xdg-output-unstable-v1.c OUTPUT xdg-output-unstable-v1.c
COMMAND wayland-scanner private-code < /usr/share/wayland-protocols/unstable/xdg-output/xdg-output-unstable-v1.xml > xdg-output-unstable-v1.c COMMAND wayland-scanner private-code < ${WAYLAND_PROTOCOLS}/unstable/xdg-output/xdg-output-unstable-v1.xml > xdg-output-unstable-v1.c
VERBATIM VERBATIM
MAIN_DEPENDENCY /usr/share/wayland-protocols/unstable/xdg-output/xdg-output-unstable-v1.xml MAIN_DEPENDENCY ${WAYLAND_PROTOCOLS}/unstable/xdg-output/xdg-output-unstable-v1.xml
) )
add_library(wayland-protocols STATIC EXCLUDE_FROM_ALL add_library(wayland-protocols STATIC EXCLUDE_FROM_ALL