diff options
| author | Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> | 2022-04-04 23:43:50 +0300 |
|---|---|---|
| committer | Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> | 2022-04-04 23:43:50 +0300 |
| commit | 1c7854930bd1cf89673e7d1f3d9b1711f5a4f30c (patch) | |
| tree | 5c39ac566123aeb85503ac82274914d1ffa7fd4a /guile | |
| parent | 4fb0e0664dbb211fcaf31d82b98983d9ecc239b0 (diff) | |
guile: improve meson build
Diffstat (limited to 'guile')
| -rw-r--r-- | guile/meson.build | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/guile/meson.build b/guile/meson.build index 0fa7e13..41a341f 100644 --- a/guile/meson.build +++ b/guile/meson.build @@ -1,4 +1,4 @@ -## Copyright (C) 2021 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> +## Copyright (C) 2022 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -29,13 +29,16 @@ run_command('chmod', '+x', compile_scm, check: true) scm_compiler=join_paths(meson.current_build_dir(), 'compile-scm') snarf = find_program('guile-snarf') +# there must be a better way of feeding the include paths to snarf... snarf_args=['-o', '@OUTPUT@', '@INPUT@', '-I' + meson.current_source_dir() + '/..', '-I' + meson.current_source_dir() + '/../lib', '-I' + meson.current_build_dir() + '/..'] - -pkg_config=find_program('pkg-config') -snarf_args+=run_command(pkg_config, '--cflags', 'glib-2.0', 'guile-3.0', - check:true).stdout().strip() +snarf_args += '-I' + join_paths(glib_dep.get_pkgconfig_variable('includedir'), + 'glib-2.0') +snarf_args += '-I' + join_paths(glib_dep.get_pkgconfig_variable('libdir'), + 'glib-2.0', 'include') +snarf_args += '-I' + join_paths(guile_dep.get_pkgconfig_variable('includedir'), + 'guile', '3.0') snarf_gen=generator(snarf, output: '@BASENAME@.x', arguments: snarf_args) |