From a7887be3ed9410e44c973b742a4dc1e977eab1f9 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Fri, 8 May 2020 20:24:07 +0300 Subject: meson.build: Add a meson variable to track libweston version Avoids the need to modify, and potentially to forget (like I did), to modify multiple places when moving/migrating to newer libweston version. Bug-AGL: SPEC-3352 Signed-off-by: Marius Vlad Change-Id: Ibab581f3e5a6b8253fad0a53dfd870cd4143b797 --- meson.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 5c1cb9e..9040f48 100644 --- a/meson.build +++ b/meson.build @@ -11,6 +11,7 @@ project('agl-compositor', config_h = configuration_data() agl_compositor_version = '0.0.18' +libweston_version = 'libweston-8' pkgconfig = import('pkgconfig') cc = meson.get_compiler('c') @@ -107,7 +108,7 @@ endif dir_data = join_paths(prefix_path, get_option('datadir')) dir_data_agl_compositor = join_paths('agl-compositor', 'protocols') dir_data_pc = join_paths(dir_data, 'pkgconfig') -libweston_dep = dependency('libweston-8') +libweston_dep = dependency(libweston_version) deps_libweston = [ dependency('wayland-server'), @@ -138,9 +139,9 @@ srcs_agl_compositor = [ # includes that can't be detected via pkg-config and passed via dependencies. if libweston_dep.found() if not prefix_path.contains('/usr') - dir_path_x11_backend = join_paths(prefix_path, 'include', 'libweston-7', 'libweston', 'backend-x11.h') + dir_path_x11_backend = join_paths(prefix_path, 'include', libweston_version, 'libweston', 'backend-x11.h') else - dir_path_x11_backend = join_paths('libweston-7', 'libweston', 'backend-x11.h') + dir_path_x11_backend = join_paths(libweston_version, 'libweston', 'backend-x11.h') endif # do the test -- cgit 1.2.3-korg