diff options
| author | Simon Ser <contact@emersion.fr> | 2021-12-08 00:27:58 +0100 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2021-12-08 00:27:58 +0100 |
| commit | ba82e0d80617f720b133ecf3a251a53cca47a6f3 (patch) | |
| tree | def4de722c7c3f1bfdb5154641cef6929c0fee70 | |
| parent | build: bump to version 1.19.93 for the RC1 release (diff) | |
| download | wayland-ba82e0d80617f720b133ecf3a251a53cca47a6f3.tar wayland-ba82e0d80617f720b133ecf3a251a53cca47a6f3.tar.gz wayland-ba82e0d80617f720b133ecf3a251a53cca47a6f3.tar.bz2 wayland-ba82e0d80617f720b133ecf3a251a53cca47a6f3.tar.lz wayland-ba82e0d80617f720b133ecf3a251a53cca47a6f3.tar.xz wayland-ba82e0d80617f720b133ecf3a251a53cca47a6f3.tar.zst wayland-ba82e0d80617f720b133ecf3a251a53cca47a6f3.zip | |
meson: override dependencies to ease use as subproject
Make it easier to use Wayland as a Meson subproject by overriding
dependencies we define. This allows to easily build Wayland as a
subproject like so:
subproject('wayland', required: false, default_options: ['documentation=false'])
After this statement, the wayland-* dependencies will use the subproject
instead of the system if available.
Signed-off-by: Simon Ser <contact@emersion.fr>
| -rw-r--r-- | cursor/meson.build | 9 | ||||
| -rw-r--r-- | egl/meson.build | 9 | ||||
| -rw-r--r-- | src/meson.build | 8 |
3 files changed, 26 insertions, 0 deletions
diff --git a/cursor/meson.build b/cursor/meson.build index 5393a59..f7d82e4 100644 --- a/cursor/meson.build +++ b/cursor/meson.build @@ -36,3 +36,12 @@ pkgconfig.generate( libraries: wayland_cursor, filebase: 'wayland-cursor', ) + +wayland_cursor_dep = declare_dependency( + link_with: wayland_cursor, + include_directories: [ root_inc, include_directories('.') ], +) + +if meson.version().version_compare('>= 0.54.0') + meson.override_dependency('wayland-cursor', wayland_cursor_dep) +endif diff --git a/egl/meson.build b/egl/meson.build index 503ac95..065fd07 100644 --- a/egl/meson.build +++ b/egl/meson.build @@ -41,3 +41,12 @@ pkgconfig.generate( description: 'Backend wayland-egl interface', version: '3' ) + +wayland_egl_dep = declare_dependency( + link_with: wayland_egl, + include_directories: [ root_inc, include_directories('.') ], +) + +if meson.version().version_compare('>= 0.54.0') + meson.override_dependency('wayland-egl', wayland_egl_dep) +endif diff --git a/src/meson.build b/src/meson.build index b76d4fe..ae8f387 100644 --- a/src/meson.build +++ b/src/meson.build @@ -207,6 +207,10 @@ if get_option('libraries') ] ) + if meson.version().version_compare('>= 0.54.0') + meson.override_dependency('wayland-server', wayland_server_dep) + endif + wayland_client = library( 'wayland-client', sources: [ @@ -251,6 +255,10 @@ if get_option('libraries') ] ) + if meson.version().version_compare('>= 0.54.0') + meson.override_dependency('wayland-client', wayland_client_dep) + endif + install_headers([ 'wayland-util.h', 'wayland-server.h', |