tboudreaux/fourdst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(wasm): propegate all build flags

Browse Source
This commit is contained in:
Emily Boudreaux
2025-12-03 11:27:01 -05:00
parent 2caf46c984
commit 979ec80dc4
8 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build-config/libcomposition/meson.build
View File

@@ -1,4 +1,9 @@
composition_p = subproject('libcomposition', default_options: ['pkg-config=' + pkg_config_bool_str])
composition_p = subproject('libcomposition',
default_options: [
'pkg_config=' + get_option('pkg_config').to_string(),
'build_tests=' + get_option('build_tests').to_string(),
'build_examples=false'
])
comp_dep = composition_p.get_variable('composition_dep')
libcomposition = composition_p.get_variable('libcomposition')
spw_dep = composition_p.get_variable('species_weight_dep')
@@ -7,4 +12,4 @@ composition_dep = [
spw_dep,
]
alias_target('build-libcomposition', libcomposition)
alias_target('build-libcomposition', libcomposition)

9
build-config/libconfig/meson.build
View File

@@ -1,5 +1,10 @@
config_p = subproject('libconfig', default_options:['pkg-config=false'])
config_p = subproject('libconfig',
default_options:[
'pkg_config=' + get_option('pkg_config').to_string(),
'build_tests=' + get_option('build_tests').to_string(),
'build_examples=false'
])
config_dep = config_p.get_variable('config_dep')
libconfig = config_p.get_variable('libconfig')
alias_target('build-libconfig', libconfig)
alias_target('build-libconfig', libconfig)

6
build-config/libconstants/meson.build
View File

@@ -1,4 +1,8 @@
const_p = subproject('libconstants', default_options: ['pkg-config=' + pkg_config_bool_str])
const_p = subproject('libconstants', default_options: [
'pkg_config=' + get_option('pkg_config').to_string(),
'build_tests=' + get_option('build_tests').to_string(),
'build_examples=false'
])
const_dep = const_p.get_variable('const_dep')
libconst = const_p.get_variable('libconst')

8
build-config/liblogging/meson.build
View File

@@ -1,4 +1,8 @@
logging_p = subproject('liblogging', default_options: ['pkg-config=' + pkg_config_bool_str])
logging_p = subproject('liblogging', default_options: [
'pkg_config=' + get_option('pkg_config').to_string(),
'build_tests=' + get_option('build_tests').to_string(),
'build_examples=false'
])
liblogging = logging_p.get_variable('liblogging')
logging_dep = logging_p.get_variable('logging_dep')
@@ -6,4 +10,4 @@ quill_dep = logging_p.get_variable('quill_dep')
log_dep = [logging_dep, quill_dep]
alias_target('build-liblogging', liblogging)
alias_target('build-liblogging', liblogging)

8
build-config/libplugin/meson.build
View File

@@ -1,10 +1,10 @@
plugin_p = subproject('libplugin', default_options: [
'pkg-config=' + pkg_config_bool_str,
'build-tests=' + get_option('build-tests').to_string(),
'python-wheel=' + get_option('build-python').to_string(),
'pkg-config=' + get_option('pkg_config').to_string(),
'build-tests=' + get_option('build_tests').to_string(),
'python-wheel=' + get_option('build_python').to_string(),
])
libplugin = plugin_p.get_variable('libplugin')
plugin_dep = plugin_p.get_variable('plugin_dep')
alias_target('build-libplugin', libplugin)
alias_target('build-libplugin', libplugin)

12
build-config/meson.build
View File

@@ -1,19 +1,19 @@
if get_option('build-lib-comp') or get_option('build-lib-all') or get_option('build-python')
if get_option('build_lib_comp') or get_option('build_lib_all') or get_option('build_python')
subdir('libcomposition')
endif
if get_option('build-lib-config') or get_option('build-lib-all') or get_option('build-python')
if get_option('build_lib_config') or get_option('build_lib_all') or get_option('build_python')
subdir('libconfig')
endif
if get_option('build-lib-const') or get_option('build-lib-all') or get_option('build-python')
if get_option('build_lib_const') or get_option('build_lib_all') or get_option('build_python')
subdir('libconstants')
endif
if get_option('build-lib-log') or get_option('build-lib-all')
if get_option('build_lib_log') or get_option('build_lib_all')
subdir('liblogging')
endif
if get_option('build-lib-plugin') or get_option('build-lib-all')
if get_option('build_lib_plugin') or get_option('build_lib_all')
subdir('libplugin')
endif
if get_option('build-python')
if get_option('build_python')
subdir('pybind')
endif