Changeset 1610 for trunk/Cbc


Ignore:
Timestamp:
Mar 9, 2011 5:57:30 AM (9 years ago)
Author:
stefan
Message:

more dependencies: add Mumps for Clp, add Metis for Mumps; rerun autotools

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        44ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
        55ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/trunk
         6ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
         7ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
        68Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
        79Data/miplib3      https://projects.coin-or.org/svn/Data/miplib3/stable/1.2
  • trunk/Cbc/configure

    r1604 r1610  
    17581758coin_projectdir=yes
    17591759
    1760 # Set the project's version number
     1760# Set the project's version numbers
    17611761
    17621762
    17631763cat >>confdefs.h <<_ACEOF
    17641764#define CBC_VERSION "$PACKAGE_VERSION"
     1765_ACEOF
     1766
     1767
     1768  coin_majorver=`echo $PACKAGE_VERSION | sed -n -e 's/^\([0-9]*\).*/\1/gp'`
     1769  coin_minorver=`echo $PACKAGE_VERSION | sed -n -e 's/^[0-9]*\.\([0-9]*\).*/\1/gp'`
     1770  coin_releasever=`echo $PACKAGE_VERSION | sed -n -e 's/^[0-9]*\.[0-9]*\.\([0-9]*\).*/\1/gp'`
     1771  if test "x$coin_majorver" = x ; then coin_majorver=9999 ; fi
     1772  if test "x$coin_minorver" = x ; then coin_minorver=9999 ; fi
     1773  if test "x$coin_releasever" = x ; then coin_releasever=9999 ; fi
     1774
     1775cat >>confdefs.h <<_ACEOF
     1776#define CBC_VERSION_MAJOR $coin_majorver
     1777_ACEOF
     1778
     1779
     1780cat >>confdefs.h <<_ACEOF
     1781#define CBC_VERSION_MINOR $coin_minorver
     1782_ACEOF
     1783
     1784
     1785cat >>confdefs.h <<_ACEOF
     1786#define CBC_VERSION_RELEASE $coin_releasever
    17651787_ACEOF
    17661788
     
    28562878        coin_add_cflags="-pipe"
    28572879        coin_dbg_cflags="-g"
    2858         coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas"
     2880        coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas -Wno-long-long"
    28592881        case $build in
    28602882          *-darwin*)
     
    37833805        coin_add_cxxflags="-pipe"
    37843806        coin_dbg_cxxflags="-g"
    3785         coin_warn_cxxflags="-Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Wno-unknown-pragmas"
     3807        coin_warn_cxxflags="-Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Wno-unknown-pragmas -Wno-long-long"
    37863808        case $build in
    37873809          *-darwin*)
     
    59515973*-*-irix6*)
    59525974  # Find out which ABI we are using.
    5953   echo '#line 5953 "configure"' > conftest.$ac_ext
     5975  echo '#line 5975 "configure"' > conftest.$ac_ext
    59545976  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    59555977  (eval $ac_compile) 2>&5
     
    70857107
    70867108# Provide some information about the compiler.
    7087 echo "$as_me:7087:" \
     7109echo "$as_me:7109:" \
    70887110     "checking for Fortran 77 compiler version" >&5
    70897111ac_compiler=`set X $ac_compile; echo $2`
     
    81528174   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81538175   -e 's:$: $lt_compiler_flag:'`
    8154    (eval echo "\"\$as_me:8154: $lt_compile\"" >&5)
     8176   (eval echo "\"\$as_me:8176: $lt_compile\"" >&5)
    81558177   (eval "$lt_compile" 2>conftest.err)
    81568178   ac_status=$?
    81578179   cat conftest.err >&5
    8158    echo "$as_me:8158: \$? = $ac_status" >&5
     8180   echo "$as_me:8180: \$? = $ac_status" >&5
    81598181   if (exit $ac_status) && test -s "$ac_outfile"; then
    81608182     # The compiler can only warn and ignore the option if not recognized
     
    84208442   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84218443   -e 's:$: $lt_compiler_flag:'`
    8422    (eval echo "\"\$as_me:8422: $lt_compile\"" >&5)
     8444   (eval echo "\"\$as_me:8444: $lt_compile\"" >&5)
    84238445   (eval "$lt_compile" 2>conftest.err)
    84248446   ac_status=$?
    84258447   cat conftest.err >&5
    8426    echo "$as_me:8426: \$? = $ac_status" >&5
     8448   echo "$as_me:8448: \$? = $ac_status" >&5
    84278449   if (exit $ac_status) && test -s "$ac_outfile"; then
    84288450     # The compiler can only warn and ignore the option if not recognized
     
    85248546   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    85258547   -e 's:$: $lt_compiler_flag:'`
    8526    (eval echo "\"\$as_me:8526: $lt_compile\"" >&5)
     8548   (eval echo "\"\$as_me:8548: $lt_compile\"" >&5)
    85278549   (eval "$lt_compile" 2>out/conftest.err)
    85288550   ac_status=$?
    85298551   cat out/conftest.err >&5
    8530    echo "$as_me:8530: \$? = $ac_status" >&5
     8552   echo "$as_me:8552: \$? = $ac_status" >&5
    85318553   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    85328554   then
     
    1086910891  lt_status=$lt_dlunknown
    1087010892  cat > conftest.$ac_ext <<EOF
    10871 #line 10871 "configure"
     10893#line 10893 "configure"
    1087210894#include "confdefs.h"
    1087310895
     
    1096910991  lt_status=$lt_dlunknown
    1097010992  cat > conftest.$ac_ext <<EOF
    10971 #line 10971 "configure"
     10993#line 10993 "configure"
    1097210994#include "confdefs.h"
    1097310995
     
    1331313335   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1331413336   -e 's:$: $lt_compiler_flag:'`
    13315    (eval echo "\"\$as_me:13315: $lt_compile\"" >&5)
     13337   (eval echo "\"\$as_me:13337: $lt_compile\"" >&5)
    1331613338   (eval "$lt_compile" 2>conftest.err)
    1331713339   ac_status=$?
    1331813340   cat conftest.err >&5
    13319    echo "$as_me:13319: \$? = $ac_status" >&5
     13341   echo "$as_me:13341: \$? = $ac_status" >&5
    1332013342   if (exit $ac_status) && test -s "$ac_outfile"; then
    1332113343     # The compiler can only warn and ignore the option if not recognized
     
    1341713439   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1341813440   -e 's:$: $lt_compiler_flag:'`
    13419    (eval echo "\"\$as_me:13419: $lt_compile\"" >&5)
     13441   (eval echo "\"\$as_me:13441: $lt_compile\"" >&5)
    1342013442   (eval "$lt_compile" 2>out/conftest.err)
    1342113443   ac_status=$?
    1342213444   cat out/conftest.err >&5
    13423    echo "$as_me:13423: \$? = $ac_status" >&5
     13445   echo "$as_me:13445: \$? = $ac_status" >&5
    1342413446   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1342513447   then
     
    1498715009   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1498815010   -e 's:$: $lt_compiler_flag:'`
    14989    (eval echo "\"\$as_me:14989: $lt_compile\"" >&5)
     15011   (eval echo "\"\$as_me:15011: $lt_compile\"" >&5)
    1499015012   (eval "$lt_compile" 2>conftest.err)
    1499115013   ac_status=$?
    1499215014   cat conftest.err >&5
    14993    echo "$as_me:14993: \$? = $ac_status" >&5
     15015   echo "$as_me:15015: \$? = $ac_status" >&5
    1499415016   if (exit $ac_status) && test -s "$ac_outfile"; then
    1499515017     # The compiler can only warn and ignore the option if not recognized
     
    1509115113   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1509215114   -e 's:$: $lt_compiler_flag:'`
    15093    (eval echo "\"\$as_me:15093: $lt_compile\"" >&5)
     15115   (eval echo "\"\$as_me:15115: $lt_compile\"" >&5)
    1509415116   (eval "$lt_compile" 2>out/conftest.err)
    1509515117   ac_status=$?
    1509615118   cat out/conftest.err >&5
    15097    echo "$as_me:15097: \$? = $ac_status" >&5
     15119   echo "$as_me:15119: \$? = $ac_status" >&5
    1509815120   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1509915121   then
     
    1729817320   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1729917321   -e 's:$: $lt_compiler_flag:'`
    17300    (eval echo "\"\$as_me:17300: $lt_compile\"" >&5)
     17322   (eval echo "\"\$as_me:17322: $lt_compile\"" >&5)
    1730117323   (eval "$lt_compile" 2>conftest.err)
    1730217324   ac_status=$?
    1730317325   cat conftest.err >&5
    17304    echo "$as_me:17304: \$? = $ac_status" >&5
     17326   echo "$as_me:17326: \$? = $ac_status" >&5
    1730517327   if (exit $ac_status) && test -s "$ac_outfile"; then
    1730617328     # The compiler can only warn and ignore the option if not recognized
     
    1756617588   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1756717589   -e 's:$: $lt_compiler_flag:'`
    17568    (eval echo "\"\$as_me:17568: $lt_compile\"" >&5)
     17590   (eval echo "\"\$as_me:17590: $lt_compile\"" >&5)
    1756917591   (eval "$lt_compile" 2>conftest.err)
    1757017592   ac_status=$?
    1757117593   cat conftest.err >&5
    17572    echo "$as_me:17572: \$? = $ac_status" >&5
     17594   echo "$as_me:17594: \$? = $ac_status" >&5
    1757317595   if (exit $ac_status) && test -s "$ac_outfile"; then
    1757417596     # The compiler can only warn and ignore the option if not recognized
     
    1767017692   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1767117693   -e 's:$: $lt_compiler_flag:'`
    17672    (eval echo "\"\$as_me:17672: $lt_compile\"" >&5)
     17694   (eval echo "\"\$as_me:17694: $lt_compile\"" >&5)
    1767317695   (eval "$lt_compile" 2>out/conftest.err)
    1767417696   ac_status=$?
    1767517697   cat out/conftest.err >&5
    17676    echo "$as_me:17676: \$? = $ac_status" >&5
     17698   echo "$as_me:17698: \$? = $ac_status" >&5
    1767717699   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1767817700   then
  • trunk/Cbc/inc/config_cbc.h.in

    r1501 r1610  
    1313/* Version number of project */
    1414#undef CBC_VERSION
     15
     16/* Major Version number of project */
     17#undef CBC_VERSION_MAJOR
     18
     19/* Minor Version number of project */
     20#undef CBC_VERSION_MINOR
     21
     22/* Release Version number of project */
     23#undef CBC_VERSION_RELEASE
    1524
    1625/* Define to the debug sanity check level (0 is no test) */
Note: See TracChangeset for help on using the changeset viewer.