Changeset 7170


Ignore:
Timestamp:
01/25/11 22:09:21 (14 years ago)
Author:
Eric.Larour
Message:

Added R2010b matlab version

Location:
issm/trunk/m4
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/m4/issm_options.m4

    r6848 r7170  
    163163                HAVE_DAKOTA=yes
    164164                DAKOTAINCL=-I$DAKOTA_ROOT/include
    165                 DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota -lteuchos -lpecos -lfftw3 -llhs  -levidence -lsurfpack -lconmin -lddace -lfsudace    -ljega -lcport -lopt -lpsuade -lnewmat    -lncsuopt -lgsl -lquadrature -lcoliny -lcolin -lpebbl     -lutilib -l3po -lnappspack -lappspack -lconveyor -lshared -lcdd -lamplsolver "
     165                DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota -lteuchos -lpecos -lfftw3 -llhs  -levidence -lsurfpack -lconmin -lddace -lfsudace    -ljega -lcport -lopt -lpsuade -lnewmat    -lncsuopt -lgsl -lgslcblas -lquadrature -lcoliny -lcolin -lpebbl     -lutilib -l3po -lnappspack -lappspack -lconveyor -lshared -lcdd -lamplsolver "
    166166
    167167                AC_DEFINE([_HAVE_DAKOTA_],[1],[with Dakota in ISSM src])

  • issm/trunk/m4/matlab.m4

    r6804 r7170  
    317317   MATLAB_MAJOR=7
    318318        MATLAB_MINOR=8
     319        ;;
     320       
     321        R2010b)
     322        MATLAB_VERSION=R2010b
     323   MATLAB_MAJOR=7
     324        MATLAB_MINOR=11
    319325        ;;
    320326
Note: See TracChangeset for help on using the changeset viewer.