[igt-dev] [PATCH i-g-t] meson: Remove redundant install params from configure_file

Petri Latvala petri.latvala at intel.com
Mon Oct 7 11:55:51 UTC 2019


The 'install' param for configure_file was added in meson 0.50, and
does nothing before that. When using meson >= 0.50 using the install
param gives a warning if the minimum required meson version is lower
than 0.50, because of reasons.

'install : false' is the default anyway when install_dir param is not
set, so remove the redundant and erroneous install param usages.

Signed-off-by: Petri Latvala <petri.latvala at intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler at intel.com>
---
 docs/reference/igt-gpu-tools/meson.build | 2 +-
 meson.build                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/reference/igt-gpu-tools/meson.build b/docs/reference/igt-gpu-tools/meson.build
index e2bdc495..2fb7f509 100644
--- a/docs/reference/igt-gpu-tools/meson.build
+++ b/docs/reference/igt-gpu-tools/meson.build
@@ -52,7 +52,7 @@ generated_docs = []
 
 configure_file(input: 'version.xml.in',
 	       output: 'version.xml',
-	       install: false, configuration: config)
+	       configuration: config)
 
 foreach group : test_groups
 	programs_xml = 'igt_test_programs_' + group + '_programs.xml'
diff --git a/meson.build b/meson.build
index fd3b6324..4d5003ba 100644
--- a/meson.build
+++ b/meson.build
@@ -239,7 +239,7 @@ config.set_quoted('PACKAGE', meson.project_name())
 config.set('PACKAGE_STRING', meson.project_name() + ' ' + meson.project_version())
 config.set_quoted('TARGET_CPU_PLATFORM', host_machine.cpu_family())
 
-configure_file(output: 'config.h', install: false, configuration: config)
+configure_file(output: 'config.h', configuration: config)
 
 prefix = get_option('prefix')
 bindir = get_option('bindir')
-- 
2.19.1



More information about the igt-dev mailing list