OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Enable MPI if path is given

Browse Source 
Assume that ./configure --with-mpi= also implies --enable-mpi; if you
absolutely want to specify path without enabling (?!) then you can do
--with-mpi=... --disable-mpi (in that order).

This patch look for anything after the equal sign of the --with
parameter and only set the variable _MPI_PREFIX_PATH if that is given;
it always toggle USE_MPI.
This commit is contained in:
Roland Kaufmann
2013-10-07 14:46:07 +02:00
committed by Andreas Lauser
parent 553bfd1805
commit 336a7b99c7
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/Scripts/configure vendored
View File

@@ -181,7 +181,7 @@ for OPT in "$@"; do
pkgname=${OPTARG%=*} pkgname=${OPTARG%=*}
pkgname=${pkgname#with-} pkgname=${pkgname#with-}
# get the location of the package; everyhing after equal sign # get the location of the package; everyhing after equal sign
pkgloc=${OPTARG#*=} test -n "${OPTARG#with-${pkgname}}" && pkgloc=${OPTARG#*=} || pkgloc=""
# the parameter to this option is an executable program, so # the parameter to this option is an executable program, so
# skip the directory test in that case # skip the directory test in that case
if [ "${pkgname}" = "cmake" ]; then if [ "${pkgname}" = "cmake" ]; then
@@ -210,7 +210,10 @@ for OPT in "$@"; do
;; ;;
mpi |\ mpi |\
mpi-prefix) mpi-prefix)
rootvar="_MPI_PREFIX_PATH" # specifying path implies use of package
use_mpi=" -DUSE_MPI=ON"
# only set prefix if specified, i.e. setting doubles as flag
test -n "${pkgloc}" && rootvar="_MPI_PREFIX_PATH" || rootvar=""
;; ;;
boost) boost)
# special handling of this package, see further below # special handling of this package, see further below
@@ -347,7 +350,7 @@ for OPT in "$@"; do
;; ;;
mpi | \ mpi | \
parallel) parallel)
use_openmp=" -DUSE_MPI=ON" use_mpi=" -DUSE_MPI=ON"
# special flag; don't set shared/static # special flag; don't set shared/static
shared="" shared=""
;; ;;