mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 12:34:55 +00:00
merge: branch 'ih/meson-qt-auto'
meson: autodetect Qt dependencies https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1906
This commit is contained in:
commit
1556bf3855
15
meson.build
15
meson.build
|
@ -961,15 +961,18 @@ test(
|
||||||
subdir('examples/C/glib')
|
subdir('examples/C/glib')
|
||||||
|
|
||||||
enable_qt = get_option('qt')
|
enable_qt = get_option('qt')
|
||||||
if enable_qt
|
if enable_qt != 'false'
|
||||||
|
qt_core_dep = dependency('QtCore', version: '>= 4', required: enable_qt == 'yes')
|
||||||
|
qt_dbus_dep = dependency('QtDBus', required: enable_qt == 'yes')
|
||||||
|
qt_network_dep = dependency('QtNetwork', required: enable_qt == 'yes')
|
||||||
|
|
||||||
|
# If enable_qt=='yes' we have all the dependencies. If it's 'auto', skip
|
||||||
|
# building the Qt examples if any dependency is missing.
|
||||||
|
if qt_core_dep.found() and qt_dbus_dep.found() and qt_network_dep.found()
|
||||||
add_languages('cpp')
|
add_languages('cpp')
|
||||||
|
|
||||||
qt_core_dep = dependency('QtCore', version: '>= 4')
|
|
||||||
qt_dbus_dep = dependency('QtDBus')
|
|
||||||
qt_network_dep = dependency('QtNetwork')
|
|
||||||
|
|
||||||
subdir('examples/C/qt')
|
subdir('examples/C/qt')
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
if enable_docs
|
if enable_docs
|
||||||
assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
|
assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
|
||||||
|
|
|
@ -74,5 +74,5 @@ option('valgrind_suppressions', type: 'string', value: '', description: 'Use spe
|
||||||
option('ld_gc', type: 'boolean', value: true, description: 'Enable garbage collection of unused symbols on linking')
|
option('ld_gc', type: 'boolean', value: true, description: 'Enable garbage collection of unused symbols on linking')
|
||||||
option('libpsl', type: 'boolean', value: true, description: 'Link against libpsl')
|
option('libpsl', type: 'boolean', value: true, description: 'Link against libpsl')
|
||||||
option('crypto', type: 'combo', choices: ['nss', 'gnutls', 'null'], value: 'nss', description: 'Cryptography library to use for certificate and key operations')
|
option('crypto', type: 'combo', choices: ['nss', 'gnutls', 'null'], value: 'nss', description: 'Cryptography library to use for certificate and key operations')
|
||||||
option('qt', type: 'boolean', value: true, description: 'enable Qt examples')
|
option('qt', type: 'combo', choices: ['auto', 'true', 'false'], value: 'auto', description: 'enable Qt examples')
|
||||||
option('readline', type: 'combo', choices: ['auto', 'libreadline', 'libedit', 'none'], description: 'Using readline (auto) or libedit)')
|
option('readline', type: 'combo', choices: ['auto', 'libreadline', 'libedit', 'none'], description: 'Using readline (auto) or libedit)')
|
||||||
|
|
Loading…
Reference in a new issue