summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2018-07-07 00:07:51 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2018-07-07 00:11:56 +0530
commit3cf58991d5a3d47203b8b6f6ac02b674aaf5c13b (patch)
tree1197ccecd64cd51d8f9e401256f12afab09e30f7
parentcdb88930da73bdbeb0e6167825121435d7e5e99f (diff)
downloadpango-3cf58991d5a3d47203b8b6f6ac02b674aaf5c13b.tar.gz
meson: Add not-found dependencies for conditional declared depswip/nirbheek/meson-declare-dependency
Instead of not defining the variable, or defining it to [], define it to the not-found dependency instead, so that when other projects (such as gtk+) are using pango as a subproject, they get a valid dependency object which tells them that the dependency cannot be found.
-rw-r--r--pango/meson.build12
1 files changed, 12 insertions, 0 deletions
diff --git a/pango/meson.build b/pango/meson.build
index 25b939f7..c44853de 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -233,6 +233,9 @@ if build_pangoft2
dependencies: pango_deps + [ libpango_dep ],
sources: pangoft2_dep_sources,
)
+else
+ # For usage as a subproject
+ libpangoft2_dep = dependency('', required : false)
endif
# Xft
@@ -289,6 +292,9 @@ if xft_dep.found()
dependencies: pango_deps + [ libpango_dep, libpangoft2_dep ],
sources: pangoxft_dep_sources,
)
+else
+ # For usage as a subproject
+ libpangoxft_dep = dependency('', required: false)
endif
# Win32
@@ -341,6 +347,9 @@ if host_system == 'windows'
include_directories: root_inc,
dependencies: pango_deps + [ libpango_dep ],
)
+else
+ # For usage as a subproject
+ libpangowin32_dep = dependency('', required: false)
endif
# Cairo
@@ -437,4 +446,7 @@ if cairo_dep.found()
dependencies: pango_deps + [ libpango_dep ],
sources: pangocairo_dep_sources,
)
+else
+ # For usage as a subproject
+ libpangocairo_dep = dependency('', required: false)
endif