Skip to content

Commit

Permalink
Merge pull request #2093 from su2code/fix_meson_issues
Browse files Browse the repository at this point in the history
Fix meson issues
  • Loading branch information
pcarruscag authored Jul 28, 2023
2 parents 53563d9 + d343c40 commit 8105a75
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ if build_machine.system() != 'windows'
endif

# meson script path
script_path = meson.source_root() / 'meson_scripts'
script_path = meson.project_source_root() / 'meson_scripts'

# mpi flag
mpi = false
Expand Down Expand Up @@ -313,6 +313,7 @@ message('''---------------------------------------------------------------------
Mixed Float: @10@
libROM: @11@
CoolProp: @12@
MLPCpp: @13@
Please be sure to add the $SU2_HOME and $SU2_RUN environment variables,
and update your $PATH (and $PYTHONPATH if applicable) with $SU2_RUN
Expand All @@ -324,11 +325,11 @@ message('''---------------------------------------------------------------------
export PATH=$PATH:$SU2_RUN
export PYTHONPATH=$PYTHONPATH:$SU2_RUN
Use './ninja -C @13@ install' to compile and install SU2
'''.format(get_option('prefix')+'/bin', meson.source_root(), get_option('enable-tecio'), get_option('enable-cgns'),
Use './ninja -C @14@ install' to compile and install SU2
'''.format(get_option('prefix')+'/bin', meson.project_source_root(), get_option('enable-tecio'), get_option('enable-cgns'),
get_option('enable-autodiff'), get_option('enable-directdiff'), get_option('enable-pywrapper'), get_option('enable-mkl'),
get_option('enable-openblas'), get_option('enable-pastix'), get_option('enable-mixedprec'), get_option('enable-librom'), get_option('enable-coolprop'),
get_option('enable-mlpcpp'), meson.build_root().startswith(meson.source_root()) ? meson.build_root().split('/')[-1] : meson.build_root()))
get_option('enable-mlpcpp'), meson.project_build_root().startswith(meson.project_source_root()) ? meson.project_build_root().split('/')[-1] : meson.project_build_root()))

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

0 comments on commit 8105a75

Please sign in to comment.