Skip to content
Snippets Groups Projects
Commit 662a4ff3 authored by Christoph Grüninger's avatar Christoph Grüninger
Browse files

Merge branch 'feature/FS1559-enable-mpi-by-default'

parents 03b86869 495f2fce
No related branches found
No related tags found
No related merge requests found
......@@ -21,12 +21,6 @@ dune_common_options_am2cmake()
default_am2cmake_options $CMAKE_PACKAGES
# Check for --enable-parallel and activate MPI
echo $PARAMS | grep \\-\\-enable-parallel > /dev/null
if test "$?" -eq 0 ; then
CMAKE_PARAMS="$CMAKE_PARAMS -DUSE_MPI=ON"
fi
# Check for --disable-parallel and deactivate MPI if given
echo $PARAMS | grep \\-\\-disable-parallel > /dev/null
if test "$?" -eq 0 ; then
......
......@@ -99,7 +99,8 @@ AC_DEFUN([DUNE_MPI],[
# enable/disable parallel features
AC_ARG_ENABLE(parallel,
AS_HELP_STRING([--enable-parallel],
[Enable the parallel features of Dune. If enabled
[Enable the parallel features of Dune, which is enabled by default.
Use --disable-parallel to disable parallel features.
configure will try to determine your MPI automatically. You can
overwrite this setting by specifying the MPICC variable]))
AC_SUBST(ENABLE_PARALLEL, "$enable_parallel")
......@@ -112,7 +113,7 @@ AC_DEFUN([DUNE_MPI],[
with_mpi="no"
## do nothing if --disable-parallel is used
AS_IF([test "x$enable_parallel" = "xyes"],[
AS_IF([test "x$enable_parallel" != "xno"],[
ACX_MPI([
MPICOMP="$MPICC"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment