Changeset 1518 for trunk


Ignore:
Timestamp:
Nov 3, 2010 3:28:51 PM (9 years ago)
Author:
lou
Message:

Update Data externals to 1.1 configuration; remove requirement for CoinUtils?
trunk.

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/configure

    r1517 r1518  
    2081820818
    2081920819if test -n "$PKG_CONFIG" ; then
    20820   if $PKG_CONFIG --exists "cgl osi coinutils = trunk"; then
    20821     COINDEPEND_VERSIONS="`$PKG_CONFIG --modversion "cgl osi coinutils = trunk" 2>/dev/null`"
    20822      cflags=`$PKG_CONFIG --cflags "cgl osi coinutils = trunk" 2>/dev/null`
     20820  if $PKG_CONFIG --exists "cgl osi coinutils"; then
     20821    COINDEPEND_VERSIONS="`$PKG_CONFIG --modversion "cgl osi coinutils" 2>/dev/null`"
     20822     cflags=`$PKG_CONFIG --cflags "cgl osi coinutils" 2>/dev/null`
    2082320823    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2082420824        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2082920829        fi
    2083020830    COINDEPEND_CFLAGS="$cflags"
    20831     COINDEPEND_LIBS=`$PKG_CONFIG --libs "cgl osi coinutils = trunk" 2>/dev/null`
    20832     COINDEPEND_DATA=`$PKG_CONFIG --variable=datadir "cgl osi coinutils = trunk" 2>/dev/null`
     20831    COINDEPEND_LIBS=`$PKG_CONFIG --libs "cgl osi coinutils" 2>/dev/null`
     20832    COINDEPEND_DATA=`$PKG_CONFIG --variable=datadir "cgl osi coinutils" 2>/dev/null`
    2083320833     coin_has_coindepend=yes
    2083420834        echo "$as_me:$LINENO: result: yes: $COINDEPEND_VERSIONS" >&5
    2083520835echo "${ECHO_T}yes: $COINDEPEND_VERSIONS" >&6
    20836         CBCLIB_PCREQUIRES="cgl osi coinutils = trunk $CBCLIB_PCREQUIRES"
    20837         CBCGENERIC_PCREQUIRES="cgl osi coinutils = trunk $CBCGENERIC_PCREQUIRES"
     20836        CBCLIB_PCREQUIRES="cgl osi coinutils $CBCLIB_PCREQUIRES"
     20837        CBCGENERIC_PCREQUIRES="cgl osi coinutils $CBCGENERIC_PCREQUIRES"
    2083820838
    2083920839
    2084020840
    2084120841  else
    20842     COINDEPEND_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors cgl osi coinutils = trunk`
     20842    COINDEPEND_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors cgl osi coinutils`
    2084320843      coin_has_coindepend=notGiven
    2084420844        echo "$as_me:$LINENO: result: not given: $COINDEPEND_PKG_ERRORS" >&5
     
    2087920879COINDEPEND_DATA=
    2088020880
    20881 # initial list of dependencies is "cgl osi coinutils = trunk", but we need to filter out version number specifications (= x, <= x, >= x)
    20882 projtoprocess="cgl osi coinutils "
     20881# initial list of dependencies is "cgl osi coinutils", but we need to filter out version number specifications (= x, <= x, >= x)
     20882projtoprocess="cgl osi coinutils"
    2088320883projprocessed=""
    2088420884
     
    2096520965
    2096620966
    20967       CBCLIB_PCREQUIRES="cgl osi coinutils = trunk $CBCLIB_PCREQUIRES"
     20967      CBCLIB_PCREQUIRES="cgl osi coinutils $CBCLIB_PCREQUIRES"
    2096820968      CBCLIB_CFLAGS="$COINDEPEND_CFLAGS $CBCLIB_CFLAGS"
    2096920969      CBCLIB_LIBS="$COINDEPEND_LIBS $CBCLIB_LIBS"
    2097020970
    20971       CBCGENERIC_PCREQUIRES="cgl osi coinutils = trunk $CBCGENERIC_PCREQUIRES"
     20971      CBCGENERIC_PCREQUIRES="cgl osi coinutils $CBCGENERIC_PCREQUIRES"
    2097220972      CBCGENERIC_CFLAGS="$COINDEPEND_CFLAGS $CBCGENERIC_CFLAGS"
    2097320973      CBCGENERIC_LIBS="$COINDEPEND_LIBS $CBCGENERIC_LIBS"
     
    2107621076
    2107721077if test $coin_has_coindepend != yes ; then
    21078   { { echo "$as_me:$LINENO: error: Required package CoinUtils, Osi, or Cgl not available." >&5
    21079 echo "$as_me: error: Required package CoinUtils, Osi, or Cgl not available." >&2;}
     21078  { { echo "$as_me:$LINENO: error: One or more required packages CoinUtils, Osi, and Cgl are not available." >&5
     21079echo "$as_me: error: One or more required packages CoinUtils, Osi, and Cgl are not available." >&2;}
    2108021080   { (exit 1); exit 1; }; }
    2108121081fi
  • trunk/Cbc/configure.ac

    r1516 r1518  
    5757#############################################################################
    5858
    59 AC_COIN_CHECK_PACKAGE(CoinDepend, [cgl osi coinutils = trunk], [CbcLib CbcGeneric])
     59AC_COIN_CHECK_PACKAGE(CoinDepend, [cgl osi coinutils], [CbcLib CbcGeneric])
    6060if test $coin_has_coindepend != yes ; then
    61   AC_MSG_ERROR([Required package CoinUtils, Osi, or Cgl not available.])
     61  AC_MSG_ERROR([One or more required packages CoinUtils, Osi, and Cgl are not available.])
    6262fi
    6363
  • trunk/Dependencies

    r1515 r1518  
    44ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
    55ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
    6 Data/Sample       https://projects.coin-or.org/svn/Data/trunk/Sample
     6Data/Sample       https://projects.coin-or.org/svn/Data/Sample/trunk
    77CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
    88Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
  • trunk/Externals

    r1464 r1518  
    44ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
    55ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/trunk
    6 Data/Sample       https://projects.coin-or.org/svn/Data/trunk/Sample
    7 #Data/miplib3      https://projects.coin-or.org/svn/Data/trunk/miplib3
     6Data/Sample       https://projects.coin-or.org/svn/Data/Sample/trunk
     7#Data/miplib3      https://projects.coin-or.org/svn/Data/miplib3/trunk
    88CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
    99Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
  • trunk/configure

    r1494 r1518  
    58955895full_prefix=`cd $full_prefix ; pwd`
    58965896
    5897 abs_lib_dir=$full_prefix/lib
     5897abs_lib_dir=$full_prefix/lib/coin
    58985898
    58995899abs_include_dir=$full_prefix/include
     
    2076020760      if test "$GXX" = "yes"; then
    2076120761        RPATH_FLAGS=
    20762         for dir in $abs_lib_dir/coin $abs_lib_dir/coin/ThirdParty; do
     20762        for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
    2076320763          RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
    2076420764        done
     
    2077720777    *-*-solaris*)
    2077820778        RPATH_FLAGS=
    20779         for dir in $abs_lib_dir/coin $abs_lib_dir/coin/ThirdParty; do
     20779        for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
    2078020780          RPATH_FLAGS="$RPATH_FLAGS -R$dir"
    2078120781        done
     
    2101021010# best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
    2101121011# unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
    21012 if test -d "${prefix}"; then
     21012if test "x${prefix}" = xNONE ; then
     21013  COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     21014else
    2101321015  COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    2101421016fi
Note: See TracChangeset for help on using the changeset viewer.