Skip to content

Commit

Permalink
meson: add more sections to main meson.build
Browse files Browse the repository at this point in the history
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
bonzini committed Dec 31, 2023
1 parent d332202 commit ea444d9
Showing 1 changed file with 18 additions and 6 deletions.
24 changes: 18 additions & 6 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ add_test_setup('thorough', env: ['G_TEST_SLOW=1', 'SPEED=thorough'])

meson.add_postconf_script(find_program('scripts/symlink-install-tree.py'))

####################
# Global variables #
####################

not_found = dependency('', required: false)
keyval = import('keyval')
ss = import('sourceset')
Expand Down Expand Up @@ -86,8 +90,16 @@ enable_modules = get_option('modules') \
.allowed()
have_block = have_system or have_tools

############
# Programs #
############

python = import('python').find_installation()

#######################################
# Variables for host and accelerators #
#######################################

if cpu not in supported_cpus
host_arch = 'unknown'
elif cpu == 'x86'
Expand Down Expand Up @@ -518,9 +530,9 @@ if sparse.found()
'-Wno-non-pointer-null'])
endif

###########################################
# Target-specific checks and dependencies #
###########################################
#####################
# Option validation #
#####################

# Fuzzing
if get_option('fuzzing') and get_option('fuzzing_engine') == '' and \
Expand Down Expand Up @@ -3524,9 +3536,9 @@ specific_ss.add_all(when: 'CONFIG_TCG_BUILTIN', if_true: tcg_module_ss)
target_modules += { 'accel' : { 'qtest': qtest_module_ss,
'tcg': tcg_real_module_ss }}

########################
# Library dependencies #
########################
##############################################
# Internal static_libraries and dependencies #
##############################################

modinfo_collect = find_program('scripts/modinfo-collect.py')
modinfo_generate = find_program('scripts/modinfo-generate.py')
Expand Down

0 comments on commit ea444d9

Please sign in to comment.