Changeset 2236 for ThirdParty/SCIP


Ignore:
Timestamp:
Jun 6, 2011 9:23:13 AM (8 years ago)
Author:
stefan
Message:

no support for Ipopt/trunk for now

Location:
ThirdParty/SCIP/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/SCIP/trunk/configure

    r2234 r2236  
    2144821448SOPLEX_DATA_INSTALLED=
    2144921449
    21450 # initial list of dependencies is "coinsoplex", but we need to filter out version number specifications (= x, <= x, >= x)
     21450# initial list of dependencies is "coinsoplex", but we need to filter out version number specifications (= x, <= x, >= x, != x)
    2145121451projtoprocess="coinsoplex"
    2145221452
     
    2191021910CLP_DATA_INSTALLED=
    2191121911
    21912 # initial list of dependencies is "clp", but we need to filter out version number specifications (= x, <= x, >= x)
     21912# initial list of dependencies is "clp", but we need to filter out version number specifications (= x, <= x, >= x, != x)
    2191321913projtoprocess="clp"
    2191421914
     
    2343823438
    2343923439if test -n "$PKG_CONFIG" ; then
    23440   if $PKG_CONFIG --exists "ipopt"; then
    23441     IPOPT_VERSIONS="`$PKG_CONFIG --modversion "ipopt" 2>/dev/null | tr '\n' ' '`"
    23442      cflags=`$PKG_CONFIG --cflags "ipopt" 2>/dev/null`
     23440  if $PKG_CONFIG --exists "ipopt != 3.9trunk"; then
     23441    IPOPT_VERSIONS="`$PKG_CONFIG --modversion "ipopt != 3.9trunk" 2>/dev/null | tr '\n' ' '`"
     23442     cflags=`$PKG_CONFIG --cflags "ipopt != 3.9trunk" 2>/dev/null`
    2344323443    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2344423444        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2344923449    fi
    2345023450    IPOPT_CFLAGS="$cflags"
    23451     IPOPT_LIBS=`$PKG_CONFIG --libs "ipopt" 2>/dev/null`
    23452     IPOPT_DATA=`$PKG_CONFIG --variable=datadir "ipopt" 2>/dev/null`
     23451    IPOPT_LIBS=`$PKG_CONFIG --libs "ipopt != 3.9trunk" 2>/dev/null`
     23452    IPOPT_DATA=`$PKG_CONFIG --variable=datadir "ipopt != 3.9trunk" 2>/dev/null`
    2345323453     coin_has_ipopt=yes
    2345423454        echo "$as_me:$LINENO: result: yes: $IPOPT_VERSIONS" >&5
     
    2346423464        # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in SCIPLib
    2346523465
    23466           SCIPLIB_PCREQUIRES="ipopt $SCIPLIB_PCREQUIRES"
     23466          SCIPLIB_PCREQUIRES="ipopt != 3.9trunk $SCIPLIB_PCREQUIRES"
    2346723467          SCIPLIB_CFLAGS="$IPOPT_CFLAGS $SCIPLIB_CFLAGS"
    2346823468          SCIPLIB_LIBS="$IPOPT_LIBS $SCIPLIB_LIBS"
     
    2347123471
    2347223472  else
    23473     IPOPT_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "ipopt"`
     23473    IPOPT_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "ipopt != 3.9trunk"`
    2347423474      coin_has_ipopt=notGiven
    2347523475        echo "$as_me:$LINENO: result: not given: $IPOPT_PKG_ERRORS" >&5
     
    2350523505IPOPT_DATA_INSTALLED=
    2350623506
    23507 # initial list of dependencies is "ipopt", but we need to filter out version number specifications (= x, <= x, >= x)
    23508 projtoprocess="ipopt"
     23507# initial list of dependencies is "ipopt != 3.9trunk", but we need to filter out version number specifications (= x, <= x, >= x, != x)
     23508projtoprocess="ipopt "
    2350923509
    2351023510# we first expand the list of projects to process by adding all dependencies just behind the project which depends on it
     
    2370223702
    2370323703
    23704     SCIPLIB_PCREQUIRES="ipopt $SCIPLIB_PCREQUIRES"
     23704    SCIPLIB_PCREQUIRES="ipopt != 3.9trunk $SCIPLIB_PCREQUIRES"
    2370523705    SCIPLIB_CFLAGS="$IPOPT_CFLAGS $SCIPLIB_CFLAGS"
    2370623706    SCIPLIB_LIBS="$IPOPT_LIBS $SCIPLIB_LIBS"
     
    2399923999CPPAD_DATA_INSTALLED=
    2400024000
    24001 # initial list of dependencies is "cppad", but we need to filter out version number specifications (= x, <= x, >= x)
     24001# initial list of dependencies is "cppad", but we need to filter out version number specifications (= x, <= x, >= x, != x)
    2400224002projtoprocess="cppad"
    2400324003
  • ThirdParty/SCIP/trunk/configure.ac

    r2234 r2236  
    187187
    188188# check for NLP solvers
    189 AC_COIN_CHECK_PACKAGE(Ipopt, ipopt, SCIPLib)
     189AC_COIN_CHECK_PACKAGE(Ipopt, ipopt != 3.9trunk, SCIPLib)
    190190
    191191# check for CppAD
Note: See TracChangeset for help on using the changeset viewer.