Ignore:
Timestamp:
Jan 10, 2011 11:18:44 AM (9 years ago)
Author:
pbelotti
Message:

adopting new build system in trunk

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property Externals deleted
    • Property svn:externals
      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.5.30
        2 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.6.4/CoinUtils
        3 ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.0.17
        4 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.0.14
        5 ThirdParty/HSL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/releases/1.1.4
        6 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.0.21
        7 ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.1.8
        8 Cbc  https://projects.coin-or.org/svn/Cbc/releases/2.4.2/Cbc
        9 Cgl  https://projects.coin-or.org/svn/Cgl/releases/0.55.0/Cgl
        10 Clp  https://projects.coin-or.org/svn/Clp/releases/1.11.1/Clp
        11 Osi  https://projects.coin-or.org/svn/Osi/releases/0.102.3/Osi
        12 Ipopt  https://projects.coin-or.org/svn/Ipopt/releases/3.8.3/Ipopt
        13 Bonmin  https://projects.coin-or.org/svn/Bonmin/releases/1.4.1/Bonmin
         1BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.7
         2CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
         3ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
         4ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
         5ThirdParty/HSL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/stable/1.3
         6ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
         7ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
         8ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
         9Cbc  https://projects.coin-or.org/svn/Cbc/stable/2.7/Cbc
         10Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
         11Clp  https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
         12Osi  https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
         13Ipopt  https://projects.coin-or.org/svn/Ipopt/trunk/Ipopt
         14Bonmin  https://projects.coin-or.org/svn/Bonmin/trunk/Bonmin
    • Property svn:mergeinfo changed
      /branches/split (added)merged: 477-484
  • trunk/Couenne

  • trunk/Couenne/src/main/BonCouenne.cpp

    • Property svn:keywords changed from Id to Author Date Id Revision
    r454 r487  
    2121#include <stdlib.h>
    2222
     23#include "CouenneConfig.h"
     24
    2325#include "CoinTime.hpp"
    2426#include "CoinError.hpp"
     
    2830
    2931#include "BonCbc.hpp"
    30 #ifdef COIN_HAS_FILTERSQP
    31 #include "BonFilterSolver.hpp"
    32 #endif
     32//#include "BonFilterSolver.hpp"
    3333
    3434#include "CbcCutGenerator.hpp"
     
    4949#include "CouenneJournalist.hpp"
    5050
    51 #include "config_couenne.h"
    52 
    5351int main (int argc, char *argv[]) {
    5452
    5553    printf ("Couenne %s --  an Open-Source exact solver for MINLP\n",
    56             strcmp (PACKAGE_VERSION, "trunk") ? PACKAGE_VERSION : "");
     54            strcmp (COUENNE_VERSION, "trunk") ? COUENNE_VERSION : "");
    5755
    5856    printf ("\
    59 Mailing list: %s\n\
    60 Instructions: http://www.coin-or.org/Couenne\n",
    61             PACKAGE_BUGREPORT);
    62 
    63   //WindowsErrorPopupBlocker();
     57Mailing list: couenne@list.coin-or.org\n\
     58Instructions: http://www.coin-or.org/Couenne\n");
     59
     60  WindowsErrorPopupBlocker();
    6461  using namespace Ipopt;
    6562
Note: See TracChangeset for help on using the changeset viewer.