diff options
| author | Tomasz Miąsko <tomasz.miasko@gmail.com> | 2018-05-09 00:00:00 +0000 |
|---|---|---|
| committer | Tomasz Miąsko <tomasz.miasko@gmail.com> | 2018-05-15 22:27:10 +0200 |
| commit | dd231b0faf587ff4e0e77519f724214e5876d5c2 (patch) | |
| tree | 68804efd99ff6697af58369205fbb3c025064ac2 /gir | |
| parent | 85cd91c1fed9f4d228dc19315918d30af749b7ca (diff) | |
| download | gobject-introspection-dd231b0faf587ff4e0e77519f724214e5876d5c2.tar.gz | |
meson: Don't use gobject-introspection-1.0 pkg-config during scan
Always use gobject-introspection-1.0 we have just built,
when running g-ir-scanner for girepository.
Diffstat (limited to 'gir')
| -rw-r--r-- | gir/meson.build | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gir/meson.build b/gir/meson.build index 945a16da..4a3b4508 100644 --- a/gir/meson.build +++ b/gir/meson.build @@ -392,13 +392,11 @@ girepository_command = scanner_command + [ '--namespace=GIRepository', '--nsversion=2.0', '--library=girepository-1.0', + '--pkg-export=gobject-introspection-1.0', + '-L' + meson.current_build_dir() + '/../girepository', ] -if dep_type == 'pkgconfig' - girepository_command += ['--external-library', '--pkg=gobject-introspection-1.0'] -else - girepository_command += ['--pkg-export=gobject-introspection-1.0', - '-L' + meson.current_build_dir() + '/../girepository'] +if dep_type != 'pkgconfig' girepository_command += glib_libpaths endif |