From 35fb7f5bafb1d59f4e903e9e549aa1bd720b42e3 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Sat, 28 Sep 2019 14:06:37 +0200 Subject: [PATCH] meson: include dir in daemon_common dependency Specify the include directory in the link_daemon_common dependency and thus everything that includes that as a dependency will get the proper include directory automatically. --- common/meson.build | 3 +-- daemon/meson.build | 1 - util/meson.build | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/common/meson.build b/common/meson.build index 78d1c03..686dd81 100644 --- a/common/meson.build +++ b/common/meson.build @@ -15,6 +15,5 @@ daemon_common = static_library( link_daemon_common = declare_dependency( link_with: daemon_common, + include_directories: [include_directories('.')] ) - -include_daemon_common = include_directories('.') \ No newline at end of file diff --git a/daemon/meson.build b/daemon/meson.build index 7a3544e..5109db3 100644 --- a/daemon/meson.build +++ b/daemon/meson.build @@ -26,7 +26,6 @@ executable( ], include_directories: [ gamemoded_includes, - include_daemon_common, ], install: true, ) \ No newline at end of file diff --git a/util/meson.build b/util/meson.build index 700f5c6..4714557 100644 --- a/util/meson.build +++ b/util/meson.build @@ -11,7 +11,6 @@ cpugovctl = executable( link_daemon_common, ], install: true, - include_directories: include_daemon_common, install_dir: path_libexecdir, ) @@ -27,6 +26,5 @@ gpuclockctl = executable( link_daemon_common, ], install: true, - include_directories: include_daemon_common, install_dir: path_libexecdir, )