diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2020-04-24 12:10:27 +0800 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2020-04-25 09:53:38 +0200 |
| commit | 65b3b5309ba4ef29b0f7247000dab105bb055098 (patch) | |
| tree | a14b90db3285f1e7ef987bb726fd1471398d92f9 /data | |
| parent | 008e0b0a3979d6bafdc3cd394cb02e57a6552c1e (diff) | |
meson: Improve cairomm pkg-config file
We only put Cairo as a required package if Cairo was found via pkg-config, but
if Cairo was found manually, we make the pkg-config file link to the cairo
library directly (-lcairo).
Diffstat (limited to 'data')
| -rw-r--r-- | data/cairomm.pc.in | 2 | ||||
| -rw-r--r-- | data/meson.build | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/data/cairomm.pc.in b/data/cairomm.pc.in index d7d0fe9..f7c2d69 100644 --- a/data/cairomm.pc.in +++ b/data/cairomm.pc.in @@ -15,5 +15,5 @@ Description: C++ binding for the cairo graphics library Version: @PACKAGE_VERSION@ URL: http://www.cairographics.org/cairomm/ Requires: @CAIROMM_MODULES@ -Libs: -L${libdir} -lcairomm-@CAIROMM_API_VERSION@ +Libs: -L${libdir} -lcairomm-@CAIROMM_API_VERSION@ @CAIROMM_EXTRA_LIBS@ Cflags: -I${includedir}/@CAIROMM_MODULE_NAME@ -I${libdir}/@CAIROMM_MODULE_NAME@/include diff --git a/data/meson.build b/data/meson.build index 676ebf5..554a9c7 100644 --- a/data/meson.build +++ b/data/meson.build @@ -16,6 +16,7 @@ pkg_conf_data.set('PACKAGE_VERSION', meson.project_version()) pkg_conf_data.set('CAIROMM_MODULE_NAME', cairomm_pcname) pkg_conf_data.set('CAIROMM_API_VERSION', cairomm_api_version) pkg_conf_data.set('CAIROMM_MODULES', cairomm_requires) +pkg_conf_data.set('CAIROMM_EXTRA_LIBS', cairomm_extra_libs) configure_file( input: 'cairomm.pc.in', |