From: Petri Latvala <petri.latvala@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Petri Latvala <petri.latvala@intel.com>
Subject: [igt-dev] [PATCH i-g-t] meson: Remove redundant install params from configure_file
Date: Mon, 7 Oct 2019 14:55:51 +0300 [thread overview]
Message-ID: <20191007115551.23750-1-petri.latvala@intel.com> (raw)
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@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@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
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next reply other threads:[~2019-10-07 11:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-07 11:55 Petri Latvala [this message]
2019-10-07 12:27 ` [igt-dev] ✗ Fi.CI.BAT: failure for meson: Remove redundant install params from configure_file Patchwork
2019-10-07 12:39 ` Petri Latvala
2019-10-07 13:29 ` Vudum, Lakshminarayana
2019-10-07 13:07 ` [igt-dev] [PATCH i-g-t] " Arkadiusz Hiler
2019-10-08 8:47 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2019-10-08 11:42 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191007115551.23750-1-petri.latvala@intel.com \
--to=petri.latvala@intel.com \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox