diff options
| author |   Marius Vlad <marius.vlad@collabora.com> | 2021-09-27 18:07:07 +0300 |
|---|---|---|
| committer | Marius Vlad <marius.vlad@collabora.com> | 2021-09-28 00:14:44 +0300 |
| commit | d6f64b665a39e0bde2fe5d5b79a0274f734b2c6e (patch) | |
| tree | fe2f8d3f5ae5e31af90e0151ce13ce56d546b766 | |
| parent | 5b8d4c56e7d793cf38286ed20b1291e3527aa85c (diff) | |
meson.build: Clarify out-of-tree build error
And with it remove libweston-X mentioning, as it applies to all
libweston versions.
Bug-AGL: SPEC-4087
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I47b37822204c3ce1397a6a5efc9e7ee6ce1e8e1b
| -rw-r--r-- | meson.build | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/meson.build b/meson.build index 0b57628..f8e97a5 100644 --- a/meson.build +++ b/meson.build @@ -13,6 +13,7 @@ config_h = configuration_data() agl_compositor_version = '0.0.19' libweston_version = 'libweston-8' pkgconfig = import('pkgconfig') +fs = import('fs') cc = meson.get_compiler('c') cxx = meson.get_compiler('cpp') @@ -134,14 +135,17 @@ foreach proto: protocols endforeach endforeach -# libweston-6 pkg-config file already has 'libweston-6' as prefix but -# agl-compositor uses 'libweston-6' also. This makes use of the prefix -# path as to allow building and installing the compositor locally +# libweston pkg-config file already has 'libweston' as prefix but +# agl-compositor uses 'libweston' also. This makes use of the prefix path as to +# allow building and installing the compositor locally prefix_path = get_option('prefix') message('prefix_path ' + prefix_path) if not prefix_path.contains('/usr') - additional_include_dir = include_directories(prefix_path + '/' + 'include') - local_dep = declare_dependency(include_directories: additional_include_dir) + include_dir_str = join_paths(prefix_path, 'include') + if not fs.is_dir(include_dir_str) + error('Prefix path does not contain an include directory!') + endif + local_dep = declare_dependency(include_directories: include_dir_str) else local_dep = [] endif |