Commit 0f96290f authored by Benjamin Berg's avatar Benjamin Berg

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.
parent bfb01552
Pipeline #22830 passed with stage
in 9 minutes and 25 seconds
......@@ -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 ])
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment