[gobject-introspection] meson: Don't use gobject-introspection-1.0 pkg-config during scan



commit dd231b0faf587ff4e0e77519f724214e5876d5c2
Author: Tomasz Miąsko <tomasz miasko gmail com>
Date:   Wed May 9 00:00:00 2018 +0000

    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.

 gir/meson.build | 8 +++-----
 1 file 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
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]