mirror of
https://gitlab.gnome.org/GNOME/libsecret.git
synced 2024-12-22 12:48:51 +00:00
Merge branch 'gcrypt-pkgconfig' into 'master'
meson: Check for gcrypt with pkg-config first See merge request GNOME/libsecret!20
This commit is contained in:
commit
d5becb2aaa
23
meson.build
23
meson.build
@ -45,17 +45,20 @@ glib_deps = [
|
|||||||
]
|
]
|
||||||
if with_gcrypt
|
if with_gcrypt
|
||||||
min_libgcrypt_version = '1.2.2'
|
min_libgcrypt_version = '1.2.2'
|
||||||
libgcrypt_config = find_program('libgcrypt-config')
|
gcrypt_dep = dependency('libgcrypt', version: '>=' + min_libgcrypt_version, required: false)
|
||||||
libgcrypt_version = run_command(libgcrypt_config, '--version').stdout().strip()
|
if not gcrypt_dep.found()
|
||||||
if (libgcrypt_version.version_compare('>' + libgcrypt_version))
|
libgcrypt_config = find_program('libgcrypt-config')
|
||||||
error('@0@ requires at least gcrypt version @1@, but version found is @2@'
|
libgcrypt_version = run_command(libgcrypt_config, '--version').stdout().strip()
|
||||||
.format(meson.project_name(), min_libgcrypt_version, libgcrypt_version))
|
if (libgcrypt_version.version_compare('>' + libgcrypt_version))
|
||||||
|
error('@0@ requires at least gcrypt version @1@, but version found is @2@'
|
||||||
|
.format(meson.project_name(), min_libgcrypt_version, libgcrypt_version))
|
||||||
|
endif
|
||||||
|
message('gcrypt version: @0@'.format(libgcrypt_version))
|
||||||
|
gcrypt_dep = declare_dependency(
|
||||||
|
link_args: run_command(libgcrypt_config, '--libs').stdout().strip().split(),
|
||||||
|
compile_args: run_command(libgcrypt_config, '--cflags').stdout().strip().split(),
|
||||||
|
)
|
||||||
endif
|
endif
|
||||||
message('gcrypt version: @0@'.format(libgcrypt_version))
|
|
||||||
gcrypt_dep = declare_dependency(
|
|
||||||
link_args: run_command(libgcrypt_config, '--libs').stdout().strip().split(),
|
|
||||||
compile_args: run_command(libgcrypt_config, '--cflags').stdout().strip().split(),
|
|
||||||
)
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Libraries
|
# Libraries
|
||||||
|
Loading…
Reference in New Issue
Block a user