ode-toolbox

commit 646806d0a141736cfcd88ea9688b69b1159ac11b
parent 1d2702d123ac47b7ca35125cc95819a4c3e1d168
Author: Fabian Wermelinger <fabianw@mavt.ethz.ch>
Date:   Thu, 28 Jan 2021 18:52:15 +0100

OpenMP is optional

Diffstat:
M
meson.build
 | 
16
++++++++--------
M
meson_options.txt
 | 
1
-

2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/meson.build b/meson.build
@@ -12,13 +12,14 @@ add_project_arguments(cpp_args, language: 'cpp')
 
 subdir('include')
 
-includes = include_directories('include')
-deps = []
-deps += declare_dependency(
-  include_directories: includes)
-if get_option('openmp')
-  deps += dependency('openmp')
-endif
+inc = include_directories('include')
+ode_toolbox_omp = dependency('openmp', required: false)
+
+ode_toolbox_dep = declare_dependency(
+  compile_args: cpp_args,
+  dependencies: ode_toolbox_omp,
+  include_directories: inc
+)
 
 if get_option('test')
   subdir('test')
@@ -31,4 +32,3 @@ pkg_mod.generate(
   filebase: 'ode_toolbox',
   description: 'ODE integrator toolbox for C++',
 )
-
diff --git a/meson_options.txt b/meson_options.txt
@@ -1,3 +1,2 @@
-option('openmp', type : 'boolean', value : true, description : 'OpenMP support', yield: true)
 option('precision', type : 'combo', choices : ['single', 'double'], value : 'double', description : 'Floating point precision', yield: true)
 option('test', type : 'boolean', value : false, description : 'Build test')