Changeset 14253

Timestamp:

01/15/13 14:47:38 (12 years ago)

Author:

jschierm

Message:

NEW: Added dakota version dependence into issm_options.m4.

File:

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

issm/trunk-jpl/m4/issm_options.m4

@@ -175 +175 @@
                 HAVE_DAKOTA=yes
                 DAKOTAINCL=-I$DAKOTA_ROOT/include
+                DAKOTA_VERSION=`cat $DAKOTA_ROOT/include/dakota_config.h | grep "#define PACKAGE_VERSION" | sed 's/#define PACKAGE_VERSION//' | sed 's/ //g' | sed -e 's/\"//g' `
+                AC_DEFINE_UNQUOTED([DAKOTA_VERSION],$DAKOTA_VERSION,[Dakota version number])
                 case "${host_os}" in
                         *cygwin*)
@@ -180 +182 @@
                         ;;
                         *linux*)
-                          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"
+                        if      test x$DAKOTA_VERSION = x4.2; then
+                                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"
+                        else if test x$DAKOTA_VERSION = x5.1 || test x$DAKOTA_VERSION = x5.2; then
+                                DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota -lteuchos -lpecos -llhs -lsparsegrid -lsurfpack -lconmin -lddace -lfsudace -ljega -lcport -loptpp -lpsuade -lncsuopt -lcolin -linterfaces -lmomh -lscolib -lpebbl -ltinyxml -lutilib -l3po -lhopspack -lnidr -lamplsolver -lboost_signals -lboost_regex -lboost_filesystem -lboost_system"
+                        else
+                                AC_MSG_ERROR([Dakota version not found or version ($DAKOTA_VERSION) not supported!]);
+                        fi
+                        fi
                         ;;
                         *darwin*)