From 578c76326dbcc626498543969af564f306d86fa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Sun, 3 Feb 2019 19:12:58 +0100 Subject: [PATCH] cmake: pull in wlr-layer-shell-unstable-v1 from wlroots git submodule --- .gitmodules | 3 +++ CMakeLists.txt | 4 ++-- external/wlroots | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 .gitmodules create mode 160000 external/wlroots diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..887b1f9 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "external/wlroots"] + path = external/wlroots + url = https://github.com/swaywm/wlroots.git diff --git a/CMakeLists.txt b/CMakeLists.txt index aaf696e..85a5954 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,9 +51,9 @@ target_link_libraries(bar-xcb xcb-stuff ${XCB_LIBRARIES} ${XCB_ERRORS_LIBRARIES} add_custom_command( OUTPUT wlr-layer-shell-unstable-v1.c - COMMAND wayland-scanner private-code < /home/daniel/AUR/wlroots-git/src/wlroots-git/protocol/wlr-layer-shell-unstable-v1.xml > wlr-layer-shell-unstable-v1.c + COMMAND wayland-scanner private-code < ${PROJECT_SOURCE_DIR}/external/wlroots/protocol/wlr-layer-shell-unstable-v1.xml > wlr-layer-shell-unstable-v1.c VERBATIM - MAIN_DEPENDENCY /home/daniel/AUR/wlroots-git/src/wlroots-git/protocol/wlr-layer-shell-unstable-v1.xml + MAIN_DEPENDENCY ${PROJECT_SOURCE_DIR}/external/wlroots/protocol/wlr-layer-shell-unstable-v1.xml ) add_custom_command( OUTPUT wlr-layer-shell-unstable-v1-client.h diff --git a/external/wlroots b/external/wlroots new file mode 160000 index 0000000..59d1b67 --- /dev/null +++ b/external/wlroots @@ -0,0 +1 @@ +Subproject commit 59d1b6790dd187c2e110e98a2fa17c1fbfee40ca