diff options
| author | José Expósito <jose.exposito89@gmail.com> | 2023-08-23 11:58:22 +0200 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2024-02-08 05:08:47 +0000 |
| commit | db56b508f25629ab1022038131758ce48e6daf82 (patch) | |
| tree | 5deaaa53980d77c2a277225b022d1b34cfdc7040 | |
| parent | cd33097fc779f280925c6d6bbfbd5150f93ca5bc (diff) | |
meson: add header paths to declare_dependency
The `install_headers()` function is used to install the headers present
in `include/<subdirectory>`.
However, when `xorgproto` is used as a subproject, the headers are not
copied and the parent project is not able to find the headers included
in subdirectories.
For example, this error is generated when `xserver` is built with
`xorgproto` as a subproject:
fatal error: xf86dri.h: No such file or directory
41 | #include "xf86dri.h"
| ^~~~~~~~~~~
This is a known issue present in Meson:
https://github.com/mesonbuild/meson/issues/2546
To workaround the issue, add the required subdirectories to
`declare_dependency()`.
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
| -rw-r--r-- | meson.build | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 404339d..13f8534 100644 --- a/meson.build +++ b/meson.build @@ -112,7 +112,16 @@ if get_option('legacy') == true endif ext_xorgproto = declare_dependency( - include_directories : include_directories('include') + include_directories : [ + include_directories('include'), + include_directories('include' / 'GL'), + include_directories('include' / 'GL' / 'internal'), + include_directories('include' / 'X11'), + include_directories('include' / 'X11' / 'dri'), + include_directories('include' / 'X11' / 'extensions'), + include_directories('include' / 'X11' / 'fonts'), + include_directories('include' / 'X11' / 'PM'), + ] ) subdir('include') |