Changeset 1131


Ignore:
Timestamp:
Feb 19, 2009 12:42:17 PM (10 years ago)
Author:
forrest
Message:

add release version

Location:
trunk/Cbc
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/configure

    r1069 r1131  
    2234522345cat >>confdefs.h <<_ACEOF
    2234622346#define CBC_DEFAULT_SOLVER "$cbc_default_solver"
     22347_ACEOF
     22348
     22349
     22350cat >>confdefs.h <<_ACEOF
     22351#define CBCVERSION "$PACKAGE_VERSION"
    2234722352_ACEOF
    2234822353
  • trunk/Cbc/configure.ac

    r1069 r1131  
    132132AC_DEFINE_UNQUOTED([CBC_DEFAULT_SOLVER],"$cbc_default_solver",
    133133  [Define to the name of the default solver to be used in cbc-generic in small letters])
     134AC_DEFINE_UNQUOTED(CBCVERSION, "$PACKAGE_VERSION", "Version of Cbc")
    134135
    135136
  • trunk/Cbc/inc/config_cbc.h.in

    r1069 r1131  
    11/* inc/config_cbc.h.in.  Generated from configure.ac by autoheader.  */
     2
     3/* "Version of Cbc" */
     4#undef CBCVERSION
    25
    36/* Define to the name of the default solver to be used in cbc-generic in small
  • trunk/Cbc/src/CbcSolver.cpp

    r1128 r1131  
    1515#include "CoinPragma.hpp"
    1616#include "CoinHelperFunctions.hpp"
    17 // Version
    18 #define CBCVERSION "2.30.00"
    1917
    2018#include "CoinMpsIO.hpp"
     
    4139#include "OsiChooseVariable.hpp"
    4240#include "OsiAuxInfo.hpp"
     41// Version
     42#ifndef CBCVERSION
     43#define CBCVERSION "2.30.00"
     44#endif
    4345//#define ORBITAL
    4446#ifdef ORBITAL
     
    41974199      parameters_[iParam].setCurrentOption("on");
    41984200      iParam = whichParam(PROBINGCUTS,numberParameters_,parameters_);
    4199       parameters_[iParam].setCurrentOption("forceon");
    4200       probingAction=4;
     4201      parameters_[iParam].setCurrentOption("on");
     4202      probingAction=1;
    42014203    }
    42024204    std::string field;
Note: See TracChangeset for help on using the changeset viewer.