From c4cea44426f934ddbcfa4bc7639d62776e286655 Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Mon, 11 Nov 2019 17:14:31 +0000 Subject: [PATCH] Use our own filename for config.h This is Meson best-practice: it avoids accidentally including the wrong config.h when using subprojects. Signed-off-by: Simon McVittie <smcv@collabora.com> --- meson.build | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 1e7d58536..0645e0876 100644 --- a/meson.build +++ b/meson.build @@ -151,13 +151,19 @@ conf_data = configuration_data() conf_data.set_quoted('VERSION', meson.project_version()) configure_file( - output : 'config.h', + output : '_steam-runtime-tools-config.h', configuration : conf_data, ) add_project_arguments(['-D_GNU_SOURCE'], language : 'c') -add_project_arguments(['-include', 'config.h'], language : 'c') -add_project_arguments(['-include', 'config.h'], language : 'cpp') +add_project_arguments( + ['-include', '_steam-runtime-tools-config.h'], + language : 'c', +) +add_project_arguments( + ['-include', '_steam-runtime-tools-config.h'], + language : 'cpp', +) glib = dependency( 'glib-2.0', -- GitLab