[gimp] meson: iso-codes is an optional dependency.
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] meson: iso-codes is an optional dependency.
- Date: Fri, 20 Sep 2019 22:29:16 +0000 (UTC)
commit 9ac117b1433c5f50090b3682d836bcae057628b9
Author: Jehan <jehan girinstud io>
Date: Sat Sep 21 00:26:31 2019 +0200
meson: iso-codes is an optional dependency.
meson.build | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/meson.build b/meson.build
index 509802a844..7b04107024 100644
--- a/meson.build
+++ b/meson.build
@@ -773,10 +773,12 @@ endif
################################################################################
# ISO codes
-isocodes = dependency('iso-codes')
-isocodes_prefix = isocodes.get_pkgconfig_variable('prefix')
-isocodes_location = isocodes_prefix / get_option('datadir') / 'xml' / 'iso-codes'
-isocodes_localedir= isocodes_prefix / get_option('datadir') / 'locale'
+isocodes = dependency('iso-codes', required: false)
+if isocodes.found()
+ isocodes_prefix = isocodes.get_pkgconfig_variable('prefix')
+ isocodes_location = isocodes_prefix / get_option('datadir') / 'xml' / 'iso-codes'
+ isocodes_localedir= isocodes_prefix / get_option('datadir') / 'locale'
+endif
conf.set('HAVE_ISO_CODES', isocodes.found())
@@ -1284,8 +1286,10 @@ conf.set_quoted('SBINDIR', prefix / get_option('sbindir'))
conf.set_quoted('SYSDATADIR', prefix / get_option('datadir'))
# Third-party/Misc
-conf.set_quoted('ISO_CODES_LOCATION', isocodes_location)
-conf.set_quoted('ISO_CODES_LOCALEDIR', isocodes_localedir)
+if isocodes.found()
+ conf.set_quoted('ISO_CODES_LOCATION', isocodes_location)
+ conf.set_quoted('ISO_CODES_LOCALEDIR', isocodes_localedir)
+endif
if platform_osx
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]