Changeset 8143 for issm/trunk

Timestamp:

05/05/11 15:00:36 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added petsc3 support for macs

File:

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

issm/trunk/m4/issm_options.m4

@@ -72 +72 @@
                                 dnl MEXLINK="-Wl,-twolevel_namespace -undefined error -arch i386 -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -bundle -Wl,-exported_symbols_list,$MATLAB_ROOT/extern/lib/maci/mexFunction.map"
                                 MEXLINK="-O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,$MATLAB_ROOT/extern/lib/maci/mexFunction.map"
+                                dnl MEXLINK="-O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,$MATLAB_ROOT/extern/lib/maci64/mexFunction.map"
                                 MEXEXT=`$MATLAB_ROOT/bin/mexext`
                                 MEXEXT=".$MEXEXT"
@@ -354 +355 @@
                         ;;
                         *darwin*)
+                        if test "$PETSC_VERSION" = "2" ; then
                         PETSCLIB="-L$PETSC_ROOT/$PETSC_ARCH/lib -L$PETSC_ROOT/lib/$PETSC_ARCH/ -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsnes -lpetscts -lpetsc"
+                        fi
+                        if test "$PETSC_VERSION" = "3" ; then
+                        PETSCLIB="-L$PETSC_ROOT/$PETSC_ARCH/lib -L$PETSC_ROOT/lib/$PETSC_ARCH/ -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetsc"
+                        dnl PETSCLIB="-L$PETSC_ROOT/lib -lpetsc"
+                        fi
                         ;;
                 esac