Merge pull request #1102 from su2code/fix_meson_init

Add an option to meson for extra dependencies (to fix mpich and lapack issues)

Author: pcarruscag

Common/include/parallelization/vectorization.hpp

@@ -32,6 +32,9 @@
 #include <initializer_list>
 #include <algorithm>
 #include <cmath>
+#ifdef __SSE2__
+#include "x86intrin.h"
+#endif
 
 namespace simd {
 
@@ -163,7 +166,6 @@ constexpr auto abs_mask_d = 0x7FFFFFFFFFFFFFFFL;
 constexpr auto sign_mask_d = 0x8000000000000000L;
 
 #ifdef __SSE2__
-#include "x86intrin.h"
 /*!
  * Create specialization for array of 2 doubles (this should be always available).
  */

meson.build

@@ -156,6 +156,13 @@ elif get_option('enable-openblas')
 
 endif
 
+extra_deps = get_option('extra-deps').split(',')
+foreach dep : extra_deps
+  if dep != ''
+    su2_deps += dependency(dep)
+  endif
+endforeach
+
 catch2_dep = declare_dependency(include_directories: 'externals/catch2/')
 
 # compile common library

meson_options.txt

@@ -13,6 +13,7 @@ option('blas-name', type : 'string', value : 'openblas', description: 'name of t
 option('enable-pastix', type : 'boolean', value : false, description: 'enable PaStiX support')
 option('pastix_root', type : 'string', value : 'externals/pastix/', description: 'PaStiX base directory')
 option('scotch_root', type : 'string', value : 'externals/scotch/', description: 'Scotch base directory')
-option('custom-mpi',  type : 'boolean', value : false, description: 'Use custom mpi include and library path from env variables')
-option('enable-tests',  type : 'boolean', value : false, description: 'Compile Unit Tests')
-option('enable-mixedprec', type : 'boolean', value : false, description: 'Use single precision floating point arithmetic for sparse algebra')
+option('custom-mpi',  type : 'boolean', value : false, description: 'enable MPI assuming the compiler and/or env vars give the correct include dirs and linker args.')
+option('enable-tests',  type : 'boolean', value : false, description: 'compile Unit Tests')
+option('enable-mixedprec', type : 'boolean', value : false, description: 'use single precision floating point arithmetic for sparse algebra')
+option('extra-deps', type : 'string', value : '', description: 'comma-separated list of extra (custom) dependencies to add for compilation')