diff options
| author | Uli Schlachter <psychon@znc.in> | 2021-06-03 15:26:07 +0000 |
|---|---|---|
| committer | Uli Schlachter <psychon@znc.in> | 2021-06-03 15:26:07 +0000 |
| commit | 39db60e957c71e2acfd9c32ab17b4a28b4a28218 (patch) | |
| tree | dcbbeb74dbfe9a54d95af8056d6b2f4bddbb16a8 /boilerplate | |
| parent | 2edcb1ac2385c670c36d7ae53ae7de1637969ced (diff) | |
| parent | 1e34651420fa77edb09045ee0ff33432c4e73d70 (diff) | |
| download | cairo-39db60e957c71e2acfd9c32ab17b4a28b4a28218.tar.gz | |
Merge branch 'build-without-zlib' into 'master'
meson: Use more dependency objects & fix build without zlib
Closes #475
See merge request cairo/cairo!184
Diffstat (limited to 'boilerplate')
| -rw-r--r-- | boilerplate/meson.build | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/boilerplate/meson.build b/boilerplate/meson.build index 0216b7a6c..cc6bc9519 100644 --- a/boilerplate/meson.build +++ b/boilerplate/meson.build @@ -35,9 +35,13 @@ cairo_boilerplate_constructors = custom_target('cairo-boilerplate-constructors.c command: [python3, files('make-cairo-boilerplate-constructors.py')[0], '@OUTPUT@', '@INPUT@']) libcairoboilerplate = static_library('cairoboilerplate', cairo_boilerplate_sources + [cairo_boilerplate_constructors], - include_directories: [incbase, incsrc], - dependencies: deps, - link_with: [libcairo], + include_directories: [incbase], + dependencies: deps + [libcairo_dep], install: false, build_by_default: false, ) + +cairoboilerplate_dep = declare_dependency( + link_with: [libcairoboilerplate], + include_directories: include_directories('.'), +) |