Changeset 1751 for trunk


Ignore:
Timestamp:
Oct 30, 2011 1:36:57 PM (8 years ago)
Author:
stefan
Message:

fix fix for AMPL: libCbcSolver now depends on ASL, if available

Location:
trunk/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/configure

    r1739 r1751  
    2921929219
    2922029220
     29221
     29222
     29223
     29224
     29225
     29226
     29227
     29228
     29229
     29230
     29231
     29232
     29233
     29234
     29235
     29236
    2922129237#check if user provided LIBS, CFLAGS, or DATA for package or disables use of package
    2922229238if test $coin_has_asl != skipping; then
     
    2923229248       ASL_PCLIBS="$withval"
    2923329249
     29250         CBCLIB_PCLIBS="$withval $CBCLIB_PCLIBS"
     29251         CBCLIB_LIBS="$withval $CBCLIB_LIBS"
     29252
     29253         CBCGENERIC_PCLIBS="$withval $CBCGENERIC_PCLIBS"
     29254         CBCGENERIC_LIBS="$withval $CBCGENERIC_LIBS"
     29255
    2923429256       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
    2923529257       if test -z "$PKG_CONFIG" ; then
    2923629258         ASL_LIBS_INSTALLED="$withval"
    29237 
     29259         CBCLIB_LIBS_INSTALLED="$withval $CBCLIB_LIBS_INSTALLED"CBCGENERIC_LIBS_INSTALLED="$withval $CBCGENERIC_LIBS_INSTALLED"
    2923829260       fi
    2923929261     fi
     
    2925229274       coin_has_asl=yes
    2925329275       ASL_CFLAGS="-I`${CYGPATH_W} $withval`"
    29254 
     29276       CBCLIB_CFLAGS="-I`${CYGPATH_W} $withval` $CBCLIB_CFLAGS"CBCGENERIC_CFLAGS="-I`${CYGPATH_W} $withval` $CBCGENERIC_CFLAGS"
    2925529277       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
    2925629278       if test -z "$PKG_CONFIG" ; then
    2925729279         ASL_CFLAGS_INSTALLED="$ASL_CFLAGS"
    29258 
     29280         CBCLIB_CFLAGS_INSTALLED="$ASL_CFLAGS $CBCLIB_CFLAGS_INSTALLED"CBCGENERIC_CFLAGS_INSTALLED="$ASL_CFLAGS $CBCGENERIC_CFLAGS_INSTALLED"
    2925929281       fi
    2926029282     fi
     
    2932029342        ASL_PCREQUIRES="coinasl"
    2932129343
    29322         # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in
     29344        # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in CbcLib CbcGeneric
     29345
     29346          CBCLIB_PCREQUIRES="coinasl $CBCLIB_PCREQUIRES"
     29347          CBCLIB_CFLAGS="$ASL_CFLAGS $CBCLIB_CFLAGS"
     29348          CBCLIB_LIBS="$ASL_LIBS $CBCLIB_LIBS"
     29349
     29350          CBCGENERIC_PCREQUIRES="coinasl $CBCGENERIC_PCREQUIRES"
     29351          CBCGENERIC_CFLAGS="$ASL_CFLAGS $CBCGENERIC_CFLAGS"
     29352          CBCGENERIC_LIBS="$ASL_LIBS $CBCGENERIC_LIBS"
    2932329353
    2932429354
     
    2956529595  ASL_PCREQUIRES="coinasl"
    2956629596
     29597    CBCLIB_PCREQUIRES="coinasl $CBCLIB_PCREQUIRES"
     29598    CBCLIB_CFLAGS="$ASL_CFLAGS $CBCLIB_CFLAGS"
     29599    CBCLIB_LIBS="$ASL_LIBS $CBCLIB_LIBS"
     29600    CBCLIB_CFLAGS_INSTALLED="$ASL_CFLAGS_INSTALLED $CBCLIB_CFLAGS_INSTALLED"
     29601    CBCLIB_LIBS_INSTALLED="$ASL_LIBS_INSTALLED $CBCLIB_LIBS_INSTALLED"
     29602
     29603    CBCGENERIC_PCREQUIRES="coinasl $CBCGENERIC_PCREQUIRES"
     29604    CBCGENERIC_CFLAGS="$ASL_CFLAGS $CBCGENERIC_CFLAGS"
     29605    CBCGENERIC_LIBS="$ASL_LIBS $CBCGENERIC_LIBS"
     29606    CBCGENERIC_CFLAGS_INSTALLED="$ASL_CFLAGS_INSTALLED $CBCGENERIC_CFLAGS_INSTALLED"
     29607    CBCGENERIC_LIBS_INSTALLED="$ASL_LIBS_INSTALLED $CBCGENERIC_LIBS_INSTALLED"
     29608
    2956729609
    2956829610fi
     
    2961129653     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    2961229654     ASL_DEPENDENCIES=`echo " $ASL_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     29655
     29656       CBCLIB_DEPENDENCIES=`echo " $CBCLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     29657
     29658       CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2961329659
    2961429660  fi
     
    2963929685echo "$as_me: ASL PCREQUIRES are $ASL_PCREQUIRES" >&6;}
    2964029686    fi
     29687
     29688      { echo "$as_me:$LINENO: CbcLib CFLAGS are $CBCLIB_CFLAGS" >&5
     29689echo "$as_me: CbcLib CFLAGS are $CBCLIB_CFLAGS" >&6;}
     29690      { echo "$as_me:$LINENO: CbcLib LIBS   are $CBCLIB_LIBS" >&5
     29691echo "$as_me: CbcLib LIBS   are $CBCLIB_LIBS" >&6;}
     29692      { echo "$as_me:$LINENO: CbcLib DEPENDENCIES are $CBCLIB_DEPENDENCIES" >&5
     29693echo "$as_me: CbcLib DEPENDENCIES are $CBCLIB_DEPENDENCIES" >&6;}
     29694
     29695      { echo "$as_me:$LINENO: CbcGeneric CFLAGS are $CBCGENERIC_CFLAGS" >&5
     29696echo "$as_me: CbcGeneric CFLAGS are $CBCGENERIC_CFLAGS" >&6;}
     29697      { echo "$as_me:$LINENO: CbcGeneric LIBS   are $CBCGENERIC_LIBS" >&5
     29698echo "$as_me: CbcGeneric LIBS   are $CBCGENERIC_LIBS" >&6;}
     29699      { echo "$as_me:$LINENO: CbcGeneric DEPENDENCIES are $CBCGENERIC_DEPENDENCIES" >&5
     29700echo "$as_me: CbcGeneric DEPENDENCIES are $CBCGENERIC_DEPENDENCIES" >&6;}
    2964129701
    2964229702  fi
  • trunk/Cbc/configure.ac

    r1720 r1751  
    104104
    105105# Ampl Solver library
    106 AC_COIN_CHECK_PACKAGE(ASL, [coinasl])
     106AC_COIN_CHECK_PACKAGE(ASL, [coinasl], [CbcLib CbcGeneric])
    107107
    108108#############################################################################
Note: See TracChangeset for help on using the changeset viewer.