When running 'meson setup' on Windows with MSYS2,
"list-dir-globs.py * failed with status 1".
Avoid using globbing to get components for app build
since they are already listed in the meson file.
Signed-off-by: Ric Li <ric...@outlook.com>
---
app/meson.build | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/app/meson.build b/app/meson.build
index e4bf5c531c..75ac37bef9 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -5,15 +5,6 @@ if is_ms_compiler
subdir_done()
endif
-disable_apps = ',' + get_option('disable_apps')
-disable_apps = run_command(list_dir_globs, disable_apps, check:
true).stdout().split()
-
-enable_apps = ',' + get_option('enable_apps')
-enable_apps = run_command(list_dir_globs, enable_apps, check:
true).stdout().split()
-if enable_apps.length() == 0
- enable_apps = run_command(list_dir_globs, '*', check:
true).stdout().split()
-endif
-
apps = [
'dumpcap',
'pdump',
@@ -41,6 +32,15 @@ if get_option('tests')
apps += 'test'
endif
+disable_apps = ',' + get_option('disable_apps')
+disable_apps = run_command(list_dir_globs, disable_apps, check:
true).stdout().split()
+
+enable_apps = ',' + get_option('enable_apps')
+enable_apps = run_command(list_dir_globs, enable_apps, check:
true).stdout().split()
+if enable_apps.length() == 0
+ enable_apps = apps
+endif
+
default_cflags = machine_args + ['-DALLOW_EXPERIMENTAL_API']
default_ldflags = []
if get_option('default_library') == 'static' and not is_windows
--
2.42.0
