diff options
| author | Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> | 2023-10-06 13:26:25 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> | 2023-10-06 13:28:33 +0300 |
| commit | 8191ab3771b60d30604f5fe7b75981312b5a545b (patch) | |
| tree | 94d00851627bdcbda2e8b930b67c126d88190efc | |
| parent | b91affd0725f2523e2563da4f6295a2977fd3945 (diff) | |
Fix issues related to utils & libutils
Fix dependency issues related to libutils, wrong use of
libutils_enabled.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | py/pykms/meson.build | 7 | ||||
| -rw-r--r-- | utils/meson.build | 10 |
3 files changed, 17 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 38c743b..8dc031e 100644 --- a/meson.build +++ b/meson.build @@ -47,7 +47,7 @@ summary({ 'kms++utils library': libutils_enabled, 'Python bindings': pybindings_enabled, 'kmscube': kmscube_enabled, - 'Utilities': libutils_enabled, + 'Utilities': utils_enabled, }, section : 'Configuration', bool_yn : true) diff --git a/py/pykms/meson.build b/py/pykms/meson.build index 866be42..19bb3d9 100644 --- a/py/pykms/meson.build +++ b/py/pykms/meson.build @@ -1,3 +1,10 @@ + +# Python bindings require libutils for now. +if not get_option('libutils') + pybindings_enabled = false + subdir_done() +endif + py3_dep = dependency('python3', required : get_option('pykms')) if py3_dep.found() == false diff --git a/utils/meson.build b/utils/meson.build index 8a05775..b1d3082 100644 --- a/utils/meson.build +++ b/utils/meson.build @@ -1,7 +1,15 @@ +if not get_option('utils') + utils_enabled = false + subdir_done() +endif + if not get_option('libutils') - error('"utils" option requires "libutils" option enabled') + utils_enabled = false + subdir_done() endif +utils_enabled = true + common_deps = [ libkmsxx_dep, libkmsxxutil_dep, libfmt_dep ] libevdev_dep = dependency('libevdev', required : false) |