Changeset 1737


Ignore:
Timestamp:
Nov 24, 2010 2:02:41 PM (9 years ago)
Author:
stefan
Message:

get the bonmin exectuable compiling and linking

Location:
branches/split/Bonmin/src
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/split/Bonmin/src/Algorithms/Branching/Makefile.am

    r1733 r1737  
    3030# Here list all include flags, relative to this "srcdir" directory.  This
    3131# "cygpath" stuff is necessary to compile with native compilers on Windows
    32 AM_CPPFLAGS = $(BONMIN_CFLAGS)
     32AM_CPPFLAGS = $(BONMINLIB_CFLAGS) \
    3333        -I`$(CYGPATH_W) $(srcdir)/../OaGenerators` \
    3434        -I`$(CYGPATH_W) $(srcdir)/..` \
     35        -I`$(CYGPATH_W) $(srcdir)/../../CbcBonmin` \
    3536        -I`$(CYGPATH_W) $(srcdir)/../../Interfaces` \
    3637        -I`$(CYGPATH_W) $(srcdir)/../../Interfaces/Ipopt` \
  • branches/split/Bonmin/src/Algorithms/Branching/Makefile.in

    r1733 r1737  
    303303# Here list all include flags, relative to this "srcdir" directory.  This
    304304# "cygpath" stuff is necessary to compile with native compilers on Windows
    305 AM_CPPFLAGS = $(BONMIN_CFLAGS)
     305AM_CPPFLAGS = $(BONMINLIB_CFLAGS) \
     306        -I`$(CYGPATH_W) $(srcdir)/../OaGenerators` \
     307        -I`$(CYGPATH_W) $(srcdir)/..` \
     308        -I`$(CYGPATH_W) $(srcdir)/../../CbcBonmin` \
     309        -I`$(CYGPATH_W) $(srcdir)/../../Interfaces` \
     310        -I`$(CYGPATH_W) $(srcdir)/../../Interfaces/Ipopt` \
     311        -I`$(CYGPATH_W) $(srcdir)/../../Interfaces/Filter`
     312
    306313
    307314# Currently, the following has to be included for BonChooseVariable.hpp, but
     
    620627        uninstall-info-am
    621628
    622         -I`$(CYGPATH_W) $(srcdir)/../OaGenerators` \
    623         -I`$(CYGPATH_W) $(srcdir)/..` \
    624         -I`$(CYGPATH_W) $(srcdir)/../../Interfaces` \
    625         -I`$(CYGPATH_W) $(srcdir)/../../Interfaces/Ipopt` \
    626         -I`$(CYGPATH_W) $(srcdir)/../../Interfaces/Filter`
    627629
    628630astyle: $(ASTYLE_FILES)
  • branches/split/Bonmin/src/Apps/BonMin.cpp

    r1722 r1737  
    3131           <<BONMIN_VERSION;
    3232  std::cout<<" using Cbc "
    33          <<CBCVERSION;
     33         <<CBC_VERSION;
    3434  std::cout<<" and Ipopt "
    3535         <<IPOPT_VERSION<<std::endl;
  • branches/split/Bonmin/src/Apps/BonVersions.hpp

    r1722 r1737  
    77#include <string>
    88
    9 static std::string IPOPT_VERSION=PACKAGE_VERSION;
    109/* undefine macros that could conflict with those in other config.h
    1110   files */
     
    2019#include "config_bonmin.h"
    2120
    22 //static std::string BONMIN_VERSION=PACKAGE_VERSION;
    23 #define BONMIN_VERSION "1.4trunk"
    2421/* undefine macros that could conflict with those in other config.h
    2522   files */
  • branches/split/Bonmin/src/Apps/Makefile.am

    r1733 r1737  
    2525        ../CbcBonmin/libbonminampl.la \
    2626        ../CbcBonmin/libbonmin.la \
    27         $(BONMINLIB_LIBS)
     27        $(BONMINLIB_LIBS) \
    2828        $(ASL_LIBS)
    2929
  • branches/split/Bonmin/src/Apps/Makefile.in

    r1733 r1737  
    6767bonmin_OBJECTS = $(am_bonmin_OBJECTS)
    6868bonmin_DEPENDENCIES = ../CbcBonmin/libbonminampl.la \
    69         ../CbcBonmin/libbonmin.la $(am__DEPENDENCIES_1)
     69        ../CbcBonmin/libbonmin.la $(am__DEPENDENCIES_1) \
     70        $(am__DEPENDENCIES_1)
    7071depcomp = $(SHELL) $(top_srcdir)/../depcomp
    7172am__depfiles_maybe = depfiles
     
    278279        ../CbcBonmin/libbonminampl.la \
    279280        ../CbcBonmin/libbonmin.la \
    280         $(BONMINLIB_LIBS)
     281        $(BONMINLIB_LIBS) \
     282        $(ASL_LIBS)
    281283
    282284
     
    614616        uninstall-binPROGRAMS uninstall-info-am
    615617
    616         $(ASL_LIBS)
    617618
    618619astyle: $(ASTYLE_FILES)
  • branches/split/Bonmin/src/Interfaces/BonCurvatureEstimator.cpp

    r1314 r1737  
    3333# include "IpWsmpSolverInterface.hpp"
    3434#endif
    35 #ifdef HAVE_MUMPS
     35#ifdef COIN_HAS_MUMPS
    3636# include "IpMumpsSolverInterface.hpp"
    3737#endif
Note: See TracChangeset for help on using the changeset viewer.