diff options
| author | Benjamin Berg <bberg@redhat.com> | 2019-03-06 17:21:31 +0100 |
|---|---|---|
| committer | Benjamin Berg <bberg@redhat.com> | 2019-03-07 13:40:07 +0100 |
| commit | 0f96290f4ccc931f352bd0dd1d6e434ae5bbe028 (patch) | |
| tree | 6bc6ef0092212f66e1b67420c3399e339f17f9a8 | |
| parent | bfb015528198675c3829241e670031f20a9ca526 (diff) | |
| download | geoclue-0f96290f4ccc931f352bd0dd1d6e434ae5bbe028.tar.gz | |
lib: Avoid linking to system-installed library
When building geoclue, in some cases the already installed library is
prefered for linking rather than the one from the build directory. This
causes problems when an old version is already installed and one is
adding new API.
This commit partially adresses this issue. A similar issue appears to
exist when building the documentation though.
| -rw-r--r-- | libgeoclue/meson.build | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libgeoclue/meson.build b/libgeoclue/meson.build index ef2761f..628458d 100644 --- a/libgeoclue/meson.build +++ b/libgeoclue/meson.build @@ -52,6 +52,11 @@ libgeoclue = library('geoclue-2', version: '0.0.0', install: true) +libgeoclue_dep = declare_dependency(link_with: libgeoclue, + include_directories: include_dirs, + dependencies: base_deps, + sources: [ libgeoclue_sources, libgeoclue_headers ]) + gir = find_program('g-ir-scanner', required: false) vapigen = find_program('vapigen', required: false) enable_gir = get_option('introspection') @@ -68,9 +73,8 @@ if gir.found() and enable_gir identifier_prefix: 'GClue', symbol_prefix: 'gclue', export_packages: 'libgeoclue-' + gclue_api_version, - dependencies: base_deps, + dependencies: [libgeoclue_dep] + base_deps, includes: [ 'GObject-2.0', 'Gio-2.0' ], - include_directories: include_dirs, install: true, header: 'geoclue.h', extra_args: [ '--quiet' ]) @@ -92,7 +96,3 @@ pkgconf.generate(version: gclue_version, subdirs: [ header_dir ], requires: pkg_requirements) -libgeoclue_dep = declare_dependency(link_with: libgeoclue, - include_directories: include_dirs, - dependencies: base_deps, - sources: [ libgeoclue_sources, libgeoclue_headers ]) |