From 1172daf19b06a4169ba26cde570566f14a3ebdf2 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Thu, 22 Aug 2019 18:53:13 +0530 Subject: [PATCH] build-sys: meson: Process subdirectories before generating configuration Subdirectories add to the top-level cdata (specifically, the SIMD detection happens in the pulsecore meson.build), so we were missing HAVE_MMX/SSE2/NEON defines without this fix. --- meson.build | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/meson.build b/meson.build index 14600db61..abe401968 100644 --- a/meson.build +++ b/meson.build @@ -674,6 +674,17 @@ endif check_dep = dependency('check', version : '>= 0.9.10', required : get_option('tests')) +# Subdirs + +subdir('po') +if get_option('man') + subdir('man') +endif +subdir('shell-completion/bash') +subdir('shell-completion/zsh') +subdir('src') +subdir('vala') + # Now generate config.h from everything above configure_file(output : 'config.h', configuration : cdata) @@ -741,17 +752,6 @@ configure_file( install_dir : cmakedir, ) -# Subdirs - -subdir('po') -if get_option('man') - subdir('man') -endif -subdir('shell-completion/bash') -subdir('shell-completion/zsh') -subdir('src') -subdir('vala') - ############################################################ # Final summary -- 2.34.1