bubble-dynamics

commit ae07d60f94d7505e8bbd652e49daa01423ff1a1d
parent 5c77af64c26d91630cacb43602e90f3282588bfb
Author: Fabian Wermelinger <fabianw@mavt.ethz.ch>
Date:   Thu, 28 Jan 2021 18:53:04 +0100

Make ode_toolbox a runtime dependency

Diffstat:
M
meson.build
 | 
6
+++---
M
src/meson.build
 | 
4
+---

2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/meson.build b/meson.build
@@ -4,9 +4,9 @@ project('bubble_dynamics', 'cpp',
   default_options: ['cpp_std=c++11', 'b_ndebug=if-release']
 )
 
-lib_ode = subproject('ode_toolbox')
-lib_ode_deps = lib_ode.get_variable('deps')
-add_project_arguments(lib_ode.get_variable('cpp_args'), language: 'cpp')
+rpbd_deps = []
+rpbd_deps += dependency('ode_toolbox', fallback: ['ode_toolbox', 'ode_toolbox_dep'])
+rpbd_deps += dependency('eigen3', fallback: ['eigen', 'eigen_dep'])
 
 subdir('src')
 subdir('test')
diff --git a/src/meson.build b/src/meson.build
@@ -1,8 +1,6 @@
-eigen_dependency = dependency('eigen3', fallback: ['eigen', 'eigen_dep'])
-
 rpbd = executable('rpbd', 'bubbleDynamics.cpp',
   include_directories: 'kernels',
-  dependencies: [lib_ode_deps, eigen_dependency],
+  dependencies: rpbd_deps,
   cpp_pch: 'pch/bubbleDynamics.h',
   install: true,
 )