summaryrefslogtreecommitdiff
path: root/meson.build
diff options
context:
space:
mode:
authorArun Raghavan <arun@arunraghavan.net>2019-08-22 18:53:13 +0530
committerArun Raghavan <arun@arunraghavan.net>2019-08-22 19:05:40 +0530
commit1172daf19b06a4169ba26cde570566f14a3ebdf2 (patch)
tree23fb5dac828b8cd6b7ddc809299cc0b72350a05e /meson.build
parentf515443fa0b6a8357f4372b88847aaf459ee1268 (diff)
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.
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build22
1 files 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