Changeset 15334

Timestamp:

06/25/13 15:20:41 (12 years ago)

Author:

glperez

Message:

CHG: Fixed a few variable name issues for Windows build and slight modification to Win7-32 config script.

Location:

issm/trunk-jpl

Files:

• configs/config-win7-32.sh (modified) (1 diff)
• m4/issm_options.m4 (modified) (2 diffs)

issm/trunk-jpl/configs/config-win7-32.sh

@@ -4 +4 @@
 ./configure --prefix=$ISSM_DIR \
    --disable-static \
-        --with-vendor=intel-win7-32  \
-        --with-matlab-dir="$MATLAB_DIR" \
+   --with-vendor=intel-win7-32  \
+   --with-matlab-dir="$MATLAB_DIR" \
    --with-blas-lapack-dir="$ISSM_DIR/externalpackages/petsc/install" \
-        --with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \
-        --with-metis-dir="$ISSM_DIR/externalpackages/metis/install" \
-        --with-petsc-dir="$ISSM_DIR/externalpackages/petsc/install" \
-        --with-petsc-arch=$ISSM_ARCH  \
-        --with-mpi-libflags-dir="$ISSM_DIR/externalpackages/petsc/install/lib" \
-   --with-mpi-libflagss="-Wl,libpetsc.lib" \
-        --with-mpi-include-dir="$ISSM_DIR/externalpackages/petsc/install/include/mpiuni" 
+   --with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \
+   --with-metis-dir="$ISSM_DIR/externalpackages/metis/install" \
+   --with-petsc-dir="$ISSM_DIR/externalpackages/petsc/install" \
+   --with-petsc-arch=$ISSM_ARCH  \
+   --with-mpi-libdir="$ISSM_DIR/externalpackages/petsc/install/lib" \
+   --with-mpi-libflags="-Wl,libpetsc.lib" \
+   --with-mpi-include="$ISSM_DIR/externalpackages/petsc/install/include/mpiuni" 

issm/trunk-jpl/m4/issm_options.m4

@@ -562 +562 @@
 
                 dnl Processing for windows
-                if  test x$VENDOR = xintel-win32; then
-                        MPI_LIBDIR=`cygpath -m $MPILIB_DIR`
-                        MPIINCL=-L`cygpath -m $MPIINCL`
-                elif test x$VENDOR = xintel-win64; then
-                        MPILIB_DIR=-L`cygpath -m $MPILIB_DIR`
+                if  test x$VENDOR = xintel-win7-32; then
+                        MPI_LIBDIR=`cygpath -m $MPI_LIBDIR`
+                        MPIINCL=`cygpath -m $MPI_INCLUDE`
+                elif test x$VENDOR = xintel-win7-64; then
+                        MPI_LIBDIR=`cygpath -m $MPI_LIBDIR`
                         MPI_INCLUDE=`cygpath -m $MPI_INCLUDE`
                 fi
@@ -575 +575 @@
                 else
                         MPIINCL=-I"$MPI_INCLUDE"
-                        MPILIB="-L$MPILIB_DIR $MPI_LIBFLAGS"
+                        MPILIB="-L$MPI_LIBDIR $MPI_LIBFLAGS"
                 fi
                 AC_DEFINE([_HAVE_MPI_],[1],[with Mpi in ISSM src])