From b75aa933ba8334b713923e5afbad536ba0cc14df Mon Sep 17 00:00:00 2001 From: Michael Hanselmann Date: Wed, 31 Mar 2021 23:43:32 +0200 Subject: [PATCH] Add local directory to include search path for meson All includes of usbredir-related headers use the form `#include "usbredirparser.h"`, i.e. not relative to the root directory. As a consequence builds would fail to find files if they weren't installed in a global include directory: ``` ../usbredirhost/usbredirhost.h:25:10: fatal error: usbredirparser.h: No such file or directory ``` Adding "." to the include paths avoids this issue. Signed-off-by: Michael Hanselmann --- usbredirhost/meson.build | 9 +++++++-- usbredirparser/meson.build | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/usbredirhost/meson.build b/usbredirhost/meson.build index 936cef5..07ec2f5 100644 --- a/usbredirhost/meson.build +++ b/usbredirhost/meson.build @@ -26,18 +26,23 @@ libusb_version = '>= 1.0.9' libusb_required_version = '@0@ @1@'.format(libusb, libusb_version) libusb = dependency(libusb, version: libusb_version) +usbredir_host_include_directories = [ + include_directories('.'), + usbredir_include_root_dir, +] + usbredir_host_lib = library('usbredirhost', usbredir_host_sources, version : usbredir_host_so_version, install : true, - include_directories: usbredir_include_root_dir, + include_directories: usbredir_host_include_directories, link_args : [usbredir_host_link_args], link_depends : usbredir_host_map_file, dependencies : [libusb, usbredir_parser_lib_dep]) usbredir_host_lib_dep = declare_dependency( link_with: usbredir_host_lib, - include_directories: usbredir_include_root_dir, + include_directories: usbredir_host_include_directories, dependencies: [libusb, usbredir_parser_lib_dep]) headers = [ diff --git a/usbredirparser/meson.build b/usbredirparser/meson.build index b3deb25..9cfa700 100644 --- a/usbredirparser/meson.build +++ b/usbredirparser/meson.build @@ -32,17 +32,22 @@ usbredir_parser_link_args = [ '-Wl,--no-undefined', ] +usbredir_parser_include_directories = [ + include_directories('.'), + usbredir_include_root_dir, +] + usbredir_parser_lib = library('usbredirparser', usbredir_parser_sources, version : usbredir_parser_so_version, install : true, - include_directories: usbredir_include_root_dir, + include_directories: usbredir_parser_include_directories, link_args : [usbredir_parser_link_args], link_depends : usbredir_parser_map_file) usbredir_parser_lib_dep = declare_dependency( link_with: usbredir_parser_lib, - include_directories: usbredir_include_root_dir) + include_directories: usbredir_parser_include_directories) headers = [ 'usbredirfilter.h', -- libgit2 1.1.0