diff --git a/.build.yml b/.build.yml index a2f855e94..c362b0f60 100644 --- a/.build.yml +++ b/.build.yml @@ -15,13 +15,7 @@ packages: - libxkbcommon sources: - https://git.sr.ht/~sircmpwn/sway - - https://git.sr.ht/~sircmpwn/wlroots tasks: - - wlroots: | - cd wlroots - meson --prefix=/usr build - ninja -C build - sudo ninja -C build install - setup: | cd sway meson build diff --git a/.gitignore b/.gitignore index b6e56f7ab..c8d850b1f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ build/ .lvimrc config-debug wayland-*-protocol.* +subprojects/wlroots/ diff --git a/.travis.yml b/.travis.yml index db7177188..2af6f1834 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,6 @@ arch: - libinput - libxkbcommon script: - - git clone https://github.com/swaywm/wlroots - - 'cd wlroots && meson --prefix=/usr build && ninja -C build && sudo ninja -C build install' - meson build --buildtype=$BUILD_TYPE - ninja -C build diff --git a/common/meson.build b/common/meson.build index 3a4282ad5..16f851057 100644 --- a/common/meson.build +++ b/common/meson.build @@ -1,3 +1,7 @@ +sway_common_deps = [ + wlroots +] + lib_sway_common = static_library('sway-common', files( 'log.c', @@ -7,5 +11,6 @@ lib_sway_common = static_library('sway-common', 'readline.c', 'ipc-client.c' ), - include_directories: sway_inc + include_directories: sway_inc, + dependencies: [sway_common_deps] ) diff --git a/meson.build b/meson.build index 695e237e7..e60571ba3 100644 --- a/meson.build +++ b/meson.build @@ -20,7 +20,7 @@ prefix = get_option('prefix') jsonc = dependency('json-c', version: '>=0.12.1') pcre = dependency('libpcre') -wlroots = dependency('wlroots') +wlroots = dependency('wlroots', fallback: ['wlroots', 'wlroots']) wayland_server = dependency('wayland-server') wayland_client = dependency('wayland-client') wayland_egl = dependency('wayland-egl') diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap new file mode 100644 index 000000000..4b5b558f9 --- /dev/null +++ b/subprojects/wlroots.wrap @@ -0,0 +1,4 @@ +[wrap-git] +directory=wlroots +url=https://github.com/swaywm/wlroots.git +revision=head