[gobject-introspection/wip/meson: 7/23] meson: Fix configuration when libffi is a subproject
- From: Nirbheek Chauhan <nirbheekc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection/wip/meson: 7/23] meson: Fix configuration when libffi is a subproject
- Date: Tue, 28 Nov 2017 12:37:22 +0000 (UTC)
commit 8ac55181269e53779f83a3a7a709e1c8b2f1bc4f
Author: Nirbheek Chauhan <nirbheek centricular com>
Date: Thu Nov 23 13:53:57 2017 +0530
meson: Fix configuration when libffi is a subproject
meson.build | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index 0fb029a..2573776 100644
--- a/meson.build
+++ b/meson.build
@@ -98,9 +98,16 @@ else
pkgconfig_conf.set('EXEEXT', '')
endif
pkgconfig_conf.set('VERSION', meson.project_version())
-pkgconfig_conf.set('FFI_PC_CFLAGS', libffi_dep.get_pkgconfig_variable('Cflags'))
pkgconfig_conf.set('FFI_PC_PACKAGES', 'libffi')
-pkgconfig_conf.set('FFI_PC_LIBS', libffi_dep.get_pkgconfig_variable('Libs'))
+if libffi_dep.type_name() == 'pkgconfig'
+ pkgconfig_conf.set('FFI_PC_CFLAGS', libffi_dep.get_pkgconfig_variable('Cflags'))
+ pkgconfig_conf.set('FFI_PC_LIBS', libffi_dep.get_pkgconfig_variable('Libs'))
+else
+ # XXX: We can't know the correct values for these, needs meson API. Maybe we
+ # should use meson's pkgconfig module to generate the whole file.
+ pkgconfig_conf.set('FFI_PC_CFLAGS', '')
+ pkgconfig_conf.set('FFI_PC_LIBS', '-lffi')
+endif
configure_file(
input: 'gobject-introspection-no-export-1.0.pc.in',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]