Changeset 15180


Ignore:
Timestamp:
05/30/13 15:54:49 (12 years ago)
Author:
jschierm
Message:

BUG: Fixed wildcard handling for DAKOTA_VERSION.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/m4/issm_options.m4

    r15171 r15180  
    177177                DAKOTAINCL=-I$DAKOTA_ROOT/include
    178178                AC_MSG_CHECKING(for dakota version)
    179                 DAKOTA_VERSION=`cat $DAKOTA_ROOT/../src/src/CommandLineHandler.* | grep 'DAKOTA version' | grep 'release' | grep -v // | sed 's/.*DAKOTA version //' | sed 's/ .*//' `
     179                if test -f "$DAKOTA_ROOT/../src/src/CommandLineHandler.C"; then
     180                        DAKOTA_VERSION=`cat $DAKOTA_ROOT/../src/src/CommandLineHandler.C | grep 'DAKOTA version' | grep 'release' | grep -v // | sed 's/.*DAKOTA version //' | sed 's/ .*//' `
     181                else if test -f "$DAKOTA_ROOT/../src/src/CommandLineHandler.cpp"; then
     182                        DAKOTA_VERSION=`cat $DAKOTA_ROOT/../src/src/CommandLineHandler.cpp | grep 'DAKOTA version' | grep 'release' | grep -v // | sed 's/.*DAKOTA version //' | sed 's/ .*//' `
     183                else
     184                        AC_MSG_ERROR([Dakota CommandLineHandler.C or CommandLineHandler.cpp file not found!]);
     185                fi
     186                fi
    180187                AC_MSG_RESULT($DAKOTA_VERSION)
    181188                AC_DEFINE_UNQUOTED([_DAKOTA_VERSION_],"$DAKOTA_VERSION",[Dakota version number])
Note: See TracChangeset for help on using the changeset viewer.