diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-07-07 00:23:06 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-07-07 00:23:06 +0530 |
| commit | a7f9685ef570963ef8ffd80c09e544f057454fbc (patch) | |
| tree | 2ad8f945c549ea74fe03fac1b0aee87e33471145 | |
| parent | bb10dd456c801cd13f875023488626323d8ecd60 (diff) | |
| download | gtk+-nirbheek/meson-fallback-dep-fixes.tar.gz | |
meson: Support graphene as a fallback dependencynirbheek/meson-fallback-dep-fixes
Don't assume graphene_dep is always a pkg-config dependency.
| -rw-r--r-- | meson.build | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 70ec5687c8..f5e4a9a6fd 100644 --- a/meson.build +++ b/meson.build @@ -653,8 +653,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 |