build(options): Options propegate much more reliably
Build options such as build-python and build-fortran have much more predicatable and sensible behavior
This commit is contained in:
@@ -1,13 +1,20 @@
|
||||
# bring in all of the fourdst utility repositories
|
||||
|
||||
fourdst_sp = subproject('fourdst')
|
||||
fourdst_sp = subproject('fourdst',
|
||||
default_options:
|
||||
['build-tests=' + get_option('build-tests').to_string(),
|
||||
'build-python=' + get_option('build-python').to_string()
|
||||
]
|
||||
)
|
||||
|
||||
composition_dep = fourdst_sp.get_variable('composition_dep')
|
||||
log_dep = fourdst_sp.get_variable('log_dep')
|
||||
const_dep = fourdst_sp.get_variable('const_dep')
|
||||
config_dep = fourdst_sp.get_variable('config_dep')
|
||||
plugin_dep = fourdst_sp.get_variable('plugin_dep')
|
||||
|
||||
libcomposition = fourdst_sp.get_variable('libcomposition')
|
||||
libconst = fourdst_sp.get_variable('libconst')
|
||||
libconfig = fourdst_sp.get_variable('libconfig')
|
||||
liblogging = fourdst_sp.get_variable('liblogging')
|
||||
liblogging = fourdst_sp.get_variable('liblogging')
|
||||
libplugin = fourdst_sp.get_variable('libplugin')
|
||||
@@ -1,5 +0,0 @@
|
||||
libplugin_sp = subproject('libplugin')
|
||||
|
||||
plugin_dep = libplugin_sp.get_variable('plugin_dep')
|
||||
libplugin = libplugin_sp.get_variable('libplugin')
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
cmake = import('cmake')
|
||||
|
||||
subdir('fourdst')
|
||||
subdir('libplugin')
|
||||
|
||||
subdir('sundials')
|
||||
|
||||
|
||||
Reference in New Issue
Block a user