diff options
| author | Daniel Stone <daniels@collabora.com> | 2017-09-20 07:22:13 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2017-09-20 13:25:46 -0400 |
| commit | d770f9293296d2d3c4e49e94130ff68c0890f625 (patch) | |
| tree | bcc76b36496c05361fd26adca82ce191f32b7f8d | |
| parent | 86a89dd6020f59964c0e924acbfae9d5a51e3148 (diff) | |
meson: Use dependency version_compare()
We can check the version on an existing dependency, rather than spinning
up pkg-config again just to check the right version.
Signed-off-by: Daniel Stone <daniels@collabora.com>
| -rw-r--r-- | include/meson.build | 7 | ||||
| -rw-r--r-- | meson.build | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/include/meson.build b/include/meson.build index 05ef76930..5eefc5f07 100644 --- a/include/meson.build +++ b/include/meson.build @@ -72,13 +72,12 @@ conf_data.set_quoted('SHMDIR', '/tmp') conf_data.set('HAVE_XSHMFENCE', xshmfence_dep.found()) conf_data.set('WITH_LIBDRM', libdrm_dep.found()) conf_data.set('GLAMOR_HAS_DRM_NAME_FROM_FD_2', - dependency('libdrm', version: '>= 2.4.74', required: false).found()) + libdrm_dep.found() and libdrm_dep.version().version_compare('>= 2.4.74')) conf_data.set('GLXEXT', build_glx) conf_data.set('GLAMOR', build_glamor) conf_data.set('GLAMOR_HAS_GBM', gbm_dep.found()) -if gbm_dep.found() and dependency('gbm', version: '>= 10.6', required: false).found() - conf_data.set('GLAMOR_HAS_GBM_LINEAR', build_glamor) -endif +conf_data.set('GLAMOR_HAS_GBM_LINEAR', + gbm_dep.found() and gbm_dep.version().version_compare('>= 10.6')) conf_data.set_quoted('SERVER_MISC_CONFIG_PATH', serverconfigdir) conf_data.set_quoted('PROJECTROOT', get_option('prefix')) diff --git a/meson.build b/meson.build index ea2a01520..26fd9a893 100644 --- a/meson.build +++ b/meson.build @@ -210,9 +210,6 @@ endif gbm_dep = dependency('', required:false) if build_glamor gbm_dep = dependency('gbm', version: '>= 10.2', required: false) - if gbm_dep.found() - gbm_linear_dep = dependency('gbm', version: '>= 10.6', required: false) - endif endif # XXX: Add more sha1 options, because Linux is about choice |