diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2018-07-16 01:02:03 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2018-07-16 01:02:03 +0000 |
| commit | 5eb16c3c397e3825e145b3127ddc172e34fce522 (patch) | |
| tree | cdde25604b003bf65d88b9df4bde00c32f4ab4ca | |
| parent | bd06f7b94e563f276550cb81c3a0e5612c88c314 (diff) | |
| parent | 3cf58991d5a3d47203b8b6f6ac02b674aaf5c13b (diff) | |
| download | pango-5eb16c3c397e3825e145b3127ddc172e34fce522.tar.gz | |
Merge branch 'wip/nirbheek/meson-declare-dependency' into 'master'
meson: Add not-found dependencies for conditional declared deps
See merge request GNOME/pango!6
| -rw-r--r-- | pango/meson.build | 12 |
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 |