Changeset 19397

Timestamp:

06/10/15 16:47:48 (10 years ago)

Author:

glperez

Message:

CHG: added logic for Windows-par and Jenkins file for Windows-par as well.

Location:

issm/trunk-jpl

Files:

• jenkins/windows-par (added)
• m4/issm_options.m4 (modified) (3 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -293 +293 @@
                MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_DIR}/extern/lib/win64/microsoft` -Wl,/export:mexFunction -Wl,/LD" 
                                         MEXEXT=".mexw64"
-                                elif test $VENDOR = MSVC-Win64; then
+                                elif test $VENDOR = MSVC-Win64 || test $VENDOR = MSVC-Win64-par; then
                                         MEXLIB="-Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib ${OSLIBS} -Wl,libf2cblas.lib -Wl,libf2clapack.lib" 
                MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_DIR}/extern/lib/win64/microsoft` -Wl,/export:mexFunction -Wl,/LD" 
@@ -915 +915 @@
                         MPI_LIBDIR=`cygpath -m $MPI_LIBDIR`
                         MPI_INCLUDE=`cygpath -m $MPI_INCLUDE`
-                elif test x$VENDOR = xMSVC-Win64; then
+                elif test x$VENDOR = xMSVC-Win64 || test x$VENDOR = xMSVC-Win64-par; then
                         MPI_LIBDIR=`cygpath -m $MPI_LIBDIR`
                         MPI_INCLUDE=`cygpath -m $MPI_INCLUDE`
@@ -1026 +1026 @@
         dnl }}}
         dnl metis{{{
-        if test "$HAVE_PETSC" = "yes" && test "x$PETSC_MAJOR" = "x3" && test $PETSC_MINOR -ge 3 && test "x$VENDOR" != "xMSVC-Win64"; then
+        if test "$HAVE_PETSC" = "yes" && test "x$PETSC_MAJOR" = "x3" && test $PETSC_MINOR -ge 3 && test "x$VENDOR" != "xMSVC-Win64" && test "x$VENDOR" != "xMSVC-Win64-par"; then
                 dnl in petsc >=3.3, metis is provided
                 HAVE_METIS="yes"