diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-07-07 00:23:06 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-07-23 20:17:04 +0530 |
| commit | b343abfa51d2791eef9f6caa47df98e14a2e38d7 (patch) | |
| tree | df0efbefaab79957dee3a42a54838cd96e75f1b5 /meson.build | |
| parent | 5df4d277527858481ca6eb7af0762c73d804f19d (diff) | |
| download | gtk+-b343abfa51d2791eef9f6caa47df98e14a2e38d7.tar.gz | |
meson: Support graphene as a fallback dependency
Don't assume graphene_dep is always a pkg-config dependency.
Closes https://gitlab.gnome.org/GNOME/gtk/issues/1197
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/meson.build b/meson.build index ede2e155a7..713877808f 100644 --- a/meson.build +++ b/meson.build @@ -640,8 +640,15 @@ if cloudproviders_enabled endif endif -graphene_has_sse2 = graphene_dep.get_pkgconfig_variable('graphene_has_sse2') == '1' -graphene_has_gcc = graphene_dep.get_pkgconfig_variable('graphene_has_gcc') == '1' +graphene_dep_type = graphene_dep.type_name() +if graphene_dep_type == 'pkgconfig' + graphene_has_sse2 = graphene_dep.get_pkgconfig_variable('graphene_has_sse2') == '1' + graphene_has_gcc = graphene_dep.get_pkgconfig_variable('graphene_has_gcc') == '1' +else + graphene_simd = subproject('graphene').get_variable('graphene_simd') + graphene_has_sse2 = graphene_simd.contains('sse2') + graphene_has_gcc = graphene_simd.contains('gcc') +endif malloc_is_aligned = false |