| Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 1 | From 2b8aa1ea4a4d1836164c934b1ab2556a32cb5af7 Mon Sep 17 00:00:00 2001 |
| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
| 3 | Date: Wed, 27 Oct 2021 20:04:02 +0200 |
| 4 | Subject: [PATCH] meson.build: Do not add dir installed-tests when |
| 5 | installed_tests is false |
| 6 | MIME-Version: 1.0 |
| 7 | Content-Type: text/plain; charset=UTF-8 |
| 8 | Content-Transfer-Encoding: 8bit |
| 9 | |
| Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 10 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/690] |
| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 11 | |
| 12 | Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com> |
| 13 | --- |
| 14 | meson.build | 4 +++- |
| 15 | 1 file changed, 3 insertions(+), 1 deletion(-) |
| 16 | |
| 17 | diff --git a/meson.build b/meson.build |
| Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 18 | index f5b91e0..3110530 100644 |
| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 19 | --- a/meson.build |
| 20 | +++ b/meson.build |
| Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 21 | @@ -680,7 +680,9 @@ if not get_option('skip_gtk_tests') |
| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 22 | have_gtk4 = dependency('gtk4', required: false).found() |
| 23 | endif |
| 24 | |
| 25 | -subdir('installed-tests') |
| 26 | +if get_option('installed_tests') |
| 27 | + subdir('installed-tests') |
| 28 | +endif |
| 29 | |
| 30 | # Note: The test program in test/ needs to be ported |
| 31 | # to Windows before we can build it on Windows. |