Skip to content

Commit 8105a75

Browse files
authored
Merge pull request #2093 from su2code/fix_meson_issues
Fix meson issues
2 parents 53563d9 + d343c40 commit 8105a75

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

meson.build

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ if build_machine.system() != 'windows'
4646
endif
4747

4848
# meson script path
49-
script_path = meson.source_root() / 'meson_scripts'
49+
script_path = meson.project_source_root() / 'meson_scripts'
5050

5151
# mpi flag
5252
mpi = false
@@ -313,6 +313,7 @@ message('''---------------------------------------------------------------------
313313
Mixed Float: @10@
314314
libROM: @11@
315315
CoolProp: @12@
316+
MLPCpp: @13@
316317
317318
Please be sure to add the $SU2_HOME and $SU2_RUN environment variables,
318319
and update your $PATH (and $PYTHONPATH if applicable) with $SU2_RUN
@@ -324,11 +325,11 @@ message('''---------------------------------------------------------------------
324325
export PATH=$PATH:$SU2_RUN
325326
export PYTHONPATH=$PYTHONPATH:$SU2_RUN
326327
327-
Use './ninja -C @13@ install' to compile and install SU2
328-
'''.format(get_option('prefix')+'/bin', meson.source_root(), get_option('enable-tecio'), get_option('enable-cgns'),
328+
Use './ninja -C @14@ install' to compile and install SU2
329+
'''.format(get_option('prefix')+'/bin', meson.project_source_root(), get_option('enable-tecio'), get_option('enable-cgns'),
329330
get_option('enable-autodiff'), get_option('enable-directdiff'), get_option('enable-pywrapper'), get_option('enable-mkl'),
330331
get_option('enable-openblas'), get_option('enable-pastix'), get_option('enable-mixedprec'), get_option('enable-librom'), get_option('enable-coolprop'),
331-
get_option('enable-mlpcpp'), meson.build_root().startswith(meson.source_root()) ? meson.build_root().split('/')[-1] : meson.build_root()))
332+
get_option('enable-mlpcpp'), meson.project_build_root().startswith(meson.project_source_root()) ? meson.project_build_root().split('/')[-1] : meson.project_build_root()))
332333

333334
if get_option('enable-mpp')
334335
message(''' To run SU2 with Mutation++ library, add these lines to your .bashrc file:

0 commit comments

Comments
 (0)