summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjell Ahlstedt <kjellahlstedt@gmail.com>2024-09-03 11:04:21 +0000
committerKjell Ahlstedt <kjellahlstedt@gmail.com>2024-09-03 11:04:21 +0000
commit6e835218800b87ef65d72ff68f0e09d1eae44be5 (patch)
tree6fd2b6f9e3e52b50c0e58ab020d231a2e5297ea3
parent9eb98ba31902ced57b1745654b2484933b0eb3b9 (diff)
parent6749f5cd2f853e11e06345aa625fd928ba0fc72c (diff)
Merge branch 'jdemille-master-patch-04855' into 'master'HEADmaster
Meson: stop warning from probing for features See merge request cairo/cairomm!31
-rw-r--r--cairomm/meson.build5
1 files changed, 1 insertions, 4 deletions
diff --git a/cairomm/meson.build b/cairomm/meson.build
index 8c80117..860b827 100644
--- a/cairomm/meson.build
+++ b/cairomm/meson.build
@@ -146,11 +146,8 @@ foreach mod : cairomm_mods
cairomm_mod_name = meson.project_name() + '-' + mod_name
# Generate and install the module only if there is a corresponding cairo module.
- if cairo_dep.type_name() == 'pkgconfig'
+ if cairo_dep.type_name() in ['pkgconfig', 'internal']
do_install = dependency(cairo_mod_name, required: false).found()
- elif cairo_dep.type_name() == 'internal'
- do_install = dependency(cairo_mod_name, fallback: 'cairo',
- required: false).found()
elif mod.length() >= 4
do_install = cpp_compiler.has_function(mod[2],
prefix: mod[3],