Changeset 19618

Timestamp:

10/02/15 13:53:50 (10 years ago)

Author:

glperez

Message:

CHG: Changed options relating to Windows build. Particularly, for parallel build.

File:

• issm/trunk-jpl/m4/issm_options.m4 (modified) (2 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -927 +927 @@
                 if  test x$VENDOR = xintel-win7-32; then
                         MPI_LIBDIR=`cygpath -m $MPI_LIBDIR`
-                        MPIINCL=`cygpath -m $MPI_INCLUDE`
+                        MPI_INCLUDE=`cygpath -m $MPI_INCLUDE`
                 elif test x$VENDOR = xintel-win7-64; then
-                        MPI_LIBDIR=`cygpath -m $MPI_LIBDIR`
+                        MPI_LIBDIR="/I`cygpath -m $MPI_LIBDIR`"
                         MPI_INCLUDE=`cygpath -m $MPI_INCLUDE`
                 elif test x$VENDOR = xMSVC-Win64 || test x$VENDOR = xMSVC-Win64-par; then
@@ -937 +937 @@
 
                 if test -z "$MPI_LIBDIR"; then
-                        if  test x$IS_WINDOWS = xyes; then
-                                MPIINCL=/I"$MPI_INCLUDE"
-                        else 
-                                MPIINCL=-I"$MPI_INCLUDE"
-                        fi
                         MPILIB="$MPI_LIBFLAGS"
                 else
-                        if  test x$IS_WINDOWS = xyes; then
-                                MPIINCL=/I"$MPI_INCLUDE"
-                        else 
-                                MPIINCL=-I"$MPI_INCLUDE"
-                        fi
                         MPILIB="-L$MPI_LIBDIR $MPI_LIBFLAGS"
                 fi
+
+                if  test x$IS_WINDOWS = xyes; then
+                        MPIINCL=/I"$MPI_INCLUDE"
+                else 
+                        MPIINCL=-I"$MPI_INCLUDE"
+                fi
+
                 AC_DEFINE([_HAVE_MPI_],[1],[with Mpi in ISSM src])
                 AC_DEFINE([HAVE_MPI],[1],[Mpi Flag for Dakota (DO NOT REMOVE)])