diff options
| author | Guido Günther <agx@sigxcpu.org> | 2023-07-19 14:05:54 +0200 |
|---|---|---|
| committer | Dan Williams <dan@ioncontrol.co> | 2025-05-22 08:20:19 -0500 |
| commit | 9cb5a2d09086fc8a1f0704436302e431947b44c0 (patch) | |
| tree | ead9b4f91728aefa364fb7a22ed088ebd17bdd35 | |
| parent | c6d1d020f74ae3320cc67074fc04fc075d9807f9 (diff) | |
build: Allow to use libmbim as subproject
This makes it simpler to build ModemManager git
Signed-off-by: Guido Günther <agx@sigxcpu.org>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | meson.build | 11 | ||||
| -rw-r--r-- | meson_options.txt | 1 | ||||
| -rw-r--r-- | subprojects/libmbim.wrap | 5 |
4 files changed, 17 insertions, 1 deletions
@@ -4,3 +4,4 @@ tags /.vscode /cscope.out +subprojects/libmbim diff --git a/meson.build b/meson.build index fa8b13a9..72d2ab22 100644 --- a/meson.build +++ b/meson.build @@ -259,7 +259,16 @@ config_h.set('WITH_BUILTIN_PLUGINS', enable_builtin_plugins) # MBIM support (enabled by default) enable_mbim = get_option('mbim') if enable_mbim - mbim_glib_dep = dependency('mbim-glib', version: '>= 1.32.0') + mbim_glib_dep = dependency('mbim-glib', version: '>= 1.32.0', + required: not get_option('subproject-fallback')) + if not mbim_glib_dep.found() and get_option('subproject-fallback') + mbim_glib_proj = subproject('libmbim', + default_options: ['man=false', + 'introspection=false', + 'bash_completion=false', + ]) + mbim_glib_dep = mbim_glib_proj.get_variable('libmbim_glib_dep') + endif endif config_h.set('WITH_MBIM', enable_mbim) diff --git a/meson_options.txt b/meson_options.txt index c0609fe8..6fbc0666 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -6,6 +6,7 @@ option('udevdir', type: 'string', value: '', description: 'udev base directory') option('examples', type: 'boolean', value: true, description: 'install examples') option('tests', type: 'boolean', value: true, description: 'enable tests') +option('subproject-fallback', type: 'boolean', value: false, description: 'allow to use subprojects') option('dbus_policy_dir', type: 'string', value: '', description: 'd-bus system policy directory') diff --git a/subprojects/libmbim.wrap b/subprojects/libmbim.wrap new file mode 100644 index 00000000..522bf8ed --- /dev/null +++ b/subprojects/libmbim.wrap @@ -0,0 +1,5 @@ +[wrap-git] +directory=libmbim +url=https://gitlab.freedesktop.org/mobile-broadband/libmbim.git +revision=main + |