diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2020-10-05 10:32:27 -0400 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2020-10-06 10:58:04 -0400 |
| commit | 084404cd150981e2d6e6613a4bfb55e7b13a0fb7 (patch) | |
| tree | 8496f62b2c413c9ce82fb7bebd7a95a00dd08e60 /src/meson.build | |
| parent | e2c1b76d7109150bcce72ae6683c5f8f2739468c (diff) | |
| download | cairo-084404cd150981e2d6e6613a4bfb55e7b13a0fb7.tar.gz | |
meson: Use pkgmod.generate() for all cairo pc files
Also override each dependency so they can be used when cairo is used as
subproject.
Diffstat (limited to 'src/meson.build')
| -rw-r--r-- | src/meson.build | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/meson.build b/src/meson.build index 023fdad74..71cba4cfe 100644 --- a/src/meson.build +++ b/src/meson.build @@ -307,15 +307,13 @@ libcairo = library('cairo', cairo_sources, cairo_headers += [configure_file(output: 'cairo-features.h', configuration: feature_conf)] -libcairo_dep = declare_dependency(link_with: libcairo, - include_directories: incbase) +libcairo_dep = declare_dependency(link_with: libcairo, include_directories: incsrc) pkgmod.generate(libcairo, description: 'Multi-platform 2D graphics library', subdirs: [meson.project_name()], - version: meson.project_version(), ) -install_headers(cairo_headers, subdir: 'cairo') +meson.override_dependency('cairo', libcairo_dep) -libcairo_dep = declare_dependency(link_with: libcairo, include_directories: incsrc) +install_headers(cairo_headers, subdir: 'cairo') |