diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2021-04-02 19:26:57 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2021-04-02 20:55:15 +0200 |
| commit | e4659ffbf5ee32cb55a045bf63ae1e81c0c2938c (patch) | |
| tree | feb2e1972c9eb0919cc8367a17cbf59ebd3aef3c | |
| parent | d224e6ccf38a4970f10713b0dab63e6747162698 (diff) | |
| download | wayland-e4659ffbf5ee32cb55a045bf63ae1e81c0c2938c.tar.gz | |
meson: Only require expat when building wayland-scanner
This code is only required for building wayland-scanner so it should be
scoped accordingly. libxml-2.0 will only be required if both "scanner"
and "dtd_validation" are set to true.
Signed-off-by: Michael Weiss <dev.primeos@gmail.com>
| -rw-r--r-- | meson.build | 7 | ||||
| -rw-r--r-- | src/meson.build | 10 |
2 files changed, 9 insertions, 8 deletions
diff --git a/meson.build b/meson.build index dd5774a..12b4641 100644 --- a/meson.build +++ b/meson.build @@ -66,13 +66,6 @@ if get_option('libraries') endif endif -scanner_deps = [ dependency('expat') ] - -if get_option('dtd_validation') - scanner_deps += dependency('libxml-2.0') - config_h.set('HAVE_LIBXML', 1) -endif - configure_file( output: 'config.h', configuration: config_h, diff --git a/src/meson.build b/src/meson.build index d91c503..b6b248c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -26,6 +26,14 @@ wayland_util_dep = declare_dependency( if get_option('scanner') # wayland-scanner + scanner_deps = [ dependency('expat') ] + scanner_args = [ '-include', 'config.h' ] + + if get_option('dtd_validation') + scanner_deps += dependency('libxml-2.0') + scanner_args += '-DHAVE_LIBXML=1' + endif + configure_file( input: '../protocol/wayland.dtd', output: 'wayland.dtd.embed', @@ -38,7 +46,7 @@ if get_option('scanner') wayland_scanner = executable( 'wayland-scanner', wayland_scanner_sources, - c_args: [ '-include', 'config.h' ], + c_args: scanner_args, include_directories: wayland_scanner_includes, dependencies: [ scanner_deps, wayland_util_dep, ], install: true |