Changeset 480


Ignore:
Timestamp:
Jan 9, 2011 11:05:55 AM (9 years ago)
Author:
stefan
Message:

get Couenne working in OS again

Location:
branches/split/Couenne
Files:
42 edited

Legend:

Unmodified
Added
Removed
  • branches/split/Couenne/Makefile.am

    r479 r480  
    8888else
    8989if COIN_CXX_IS_CL
    90         echo "/libpath:`$(CYGPATH_W) @abs_lib_dir@` libCouenne.lib @COUENNELIB_LIBS_INSTALLED@" > $(addlibsdir)/couenne_addlibs_cpp.txt
     90        echo "/libpath:`$(CYGPATH_W) @abs_lib_dir@` libBonCouenne.lib libCouenne.lib @COUENNELIB_LIBS_INSTALLED@" > $(addlibsdir)/couenne_addlibs_cpp.txt
    9191else
    92         echo -L@abs_lib_dir@ -lCouenne @COUENNELIB_LIBS_INSTALLED@ > $(addlibsdir)/couenne_addlibs.txt
     92        echo -L@abs_lib_dir@ -lBonCouenne -lCouenne @COUENNELIB_LIBS_INSTALLED@ > $(addlibsdir)/couenne_addlibs.txt
    9393endif
    9494endif
  • branches/split/Couenne/Makefile.in

    r478 r480  
    181181CPP = @CPP@
    182182CPPFLAGS = @CPPFLAGS@
     183CPXINCDIR = @CPXINCDIR@
    183184CPX_CFLAGS = @CPX_CFLAGS@
    184185CPX_CFLAGS_INSTALLED = @CPX_CFLAGS_INSTALLED@
  • branches/split/Couenne/configure

    r478 r480  
    473473#endif"
    474474
    475 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion COUENNE_SVN_REV COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX COIN_CXX_IS_CL_TRUE COIN_CXX_IS_CL_FALSE MPICXX EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED BONMIN_LIBS BONMIN_CFLAGS BONMIN_DATA BONMIN_DEPENDENCIES BONMIN_LIBS_INSTALLED BONMIN_CFLAGS_INSTALLED BONMIN_DATA_INSTALLED COUENNELIB_CFLAGS COUENNELIB_LIBS COUENNELIB_PCLIBS COUENNELIB_PCREQUIRES COUENNELIB_DEPENDENCIES COUENNELIB_CFLAGS_INSTALLED COUENNELIB_LIBS_INSTALLED COIN_HAS_BONMIN_TRUE COIN_HAS_BONMIN_FALSE ASL_LIBS ASL_CFLAGS ASL_DATA ASL_DEPENDENCIES ASL_LIBS_INSTALLED ASL_CFLAGS_INSTALLED ASL_DATA_INSTALLED COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE NTYINCDIR NTYLIB COIN_HAS_NTY_TRUE COIN_HAS_NTY_FALSE CPX_LIBS CPX_CFLAGS CPX_DATA CPX_DEPENDENCIES CPX_LIBS_INSTALLED CPX_CFLAGS_INSTALLED CPX_DATA_INSTALLED COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE GRB_LIBS GRB_CFLAGS GRB_DATA GRB_DEPENDENCIES GRB_LIBS_INSTALLED GRB_CFLAGS_INSTALLED GRB_DATA_INSTALLED COIN_HAS_GRB_TRUE COIN_HAS_GRB_FALSE MSK_LIBS MSK_CFLAGS MSK_DATA MSK_DEPENDENCIES MSK_LIBS_INSTALLED MSK_CFLAGS_INSTALLED MSK_DATA_INSTALLED COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE SPX_LIBS SPX_CFLAGS SPX_DATA SPX_DEPENDENCIES SPX_LIBS_INSTALLED SPX_CFLAGS_INSTALLED SPX_DATA_INSTALLED COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPR_LIBS XPR_CFLAGS XPR_DATA XPR_DEPENDENCIES XPR_LIBS_INSTALLED XPR_CFLAGS_INSTALLED XPR_DATA_INSTALLED COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
     475ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion COUENNE_SVN_REV COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX COIN_CXX_IS_CL_TRUE COIN_CXX_IS_CL_FALSE MPICXX EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED BONMIN_LIBS BONMIN_CFLAGS BONMIN_DATA BONMIN_DEPENDENCIES BONMIN_LIBS_INSTALLED BONMIN_CFLAGS_INSTALLED BONMIN_DATA_INSTALLED COUENNELIB_CFLAGS COUENNELIB_LIBS COUENNELIB_PCLIBS COUENNELIB_PCREQUIRES COUENNELIB_DEPENDENCIES COUENNELIB_CFLAGS_INSTALLED COUENNELIB_LIBS_INSTALLED COIN_HAS_BONMIN_TRUE COIN_HAS_BONMIN_FALSE ASL_LIBS ASL_CFLAGS ASL_DATA ASL_DEPENDENCIES ASL_LIBS_INSTALLED ASL_CFLAGS_INSTALLED ASL_DATA_INSTALLED COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE NTYINCDIR NTYLIB COIN_HAS_NTY_TRUE COIN_HAS_NTY_FALSE CPX_LIBS CPX_CFLAGS CPX_DATA CPX_DEPENDENCIES CPX_LIBS_INSTALLED CPX_CFLAGS_INSTALLED CPX_DATA_INSTALLED COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE CPXINCDIR GRB_LIBS GRB_CFLAGS GRB_DATA GRB_DEPENDENCIES GRB_LIBS_INSTALLED GRB_CFLAGS_INSTALLED GRB_DATA_INSTALLED COIN_HAS_GRB_TRUE COIN_HAS_GRB_FALSE MSK_LIBS MSK_CFLAGS MSK_DATA MSK_DEPENDENCIES MSK_LIBS_INSTALLED MSK_CFLAGS_INSTALLED MSK_DATA_INSTALLED COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE SPX_LIBS SPX_CFLAGS SPX_DATA SPX_DEPENDENCIES SPX_LIBS_INSTALLED SPX_CFLAGS_INSTALLED SPX_DATA_INSTALLED COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPR_LIBS XPR_CFLAGS XPR_DATA XPR_DEPENDENCIES XPR_LIBS_INSTALLED XPR_CFLAGS_INSTALLED XPR_DATA_INSTALLED COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    2263222632
    2263322633# Bonmin AMPL interface
     22634# bad bad: if AMPL stuff is available, then libCouenne will depend on it, so we add it to CouenneLib
    2263422635
    2263522636echo "$as_me:$LINENO: checking for COIN-OR package ASL" >&5
     
    2265022651ASL_CFLAGS=
    2265122652ASL_DATA=
     22653
     22654
     22655
     22656
     22657
     22658
     22659
     22660
    2265222661
    2265322662
     
    2267122680       ASL_LIBS="$withval"
    2267222681
     22682         COUENNELIB_PCLIBS="$withval $COUENNELIB_PCLIBS"
     22683         COUENNELIB_LIBS="$withval $COUENNELIB_LIBS"
     22684
    2267322685     fi
    2267422686
     
    2268622698       coin_has_asl=yes
    2268722699       ASL_CFLAGS="-I`${CYGPATH_W} $withval`"
    22688 
     22700       COUENNELIB_CFLAGS="$withval $COUENNELIB_CFLAGS"
    2268922701     fi
    2269022702
     
    2274422756        fi
    2274522757
    22746         # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in
     22758        # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in CouenneLib
     22759
     22760          COUENNELIB_PCREQUIRES="bonminamplinterface $COUENNELIB_PCREQUIRES"
     22761          COUENNELIB_CFLAGS="$ASL_CFLAGS $COUENNELIB_CFLAGS"
     22762          COUENNELIB_LIBS="$ASL_LIBS $COUENNELIB_LIBS"
    2274722763
    2274822764
     
    2298022996
    2298122997
     22998    COUENNELIB_PCREQUIRES="bonminamplinterface $COUENNELIB_PCREQUIRES"
     22999    COUENNELIB_CFLAGS="$ASL_CFLAGS $COUENNELIB_CFLAGS"
     23000    COUENNELIB_LIBS="$ASL_LIBS $COUENNELIB_LIBS"
     23001    COUENNELIB_CFLAGS_INSTALLED="$ASL_CFLAGS_INSTALLED $COUENNELIB_CFLAGS_INSTALLED"
     23002    COUENNELIB_LIBS_INSTALLED="$ASL_LIBS_INSTALLED $COUENNELIB_LIBS_INSTALLED"
     23003
    2298223004
    2298323005fi
     
    2302623048     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    2302723049     ASL_DEPENDENCIES=`echo " $ASL_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     23050
     23051       COUENNELIB_DEPENDENCIES=`echo " $COUENNELIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2302823052
    2302923053  fi
     
    2305023074echo "$as_me: ASL CFLAGS are $ASL_CFLAGS" >&6;}
    2305123075    fi
     23076
     23077      { echo "$as_me:$LINENO: CouenneLib CFLAGS are $COUENNELIB_CFLAGS" >&5
     23078echo "$as_me: CouenneLib CFLAGS are $COUENNELIB_CFLAGS" >&6;}
     23079      { echo "$as_me:$LINENO: CouenneLib LIBS   are $COUENNELIB_LIBS" >&5
     23080echo "$as_me: CouenneLib LIBS   are $COUENNELIB_LIBS" >&6;}
     23081      { echo "$as_me:$LINENO: CouenneLib DEPENDENCIES are $COUENNELIB_DEPENDENCIES" >&5
     23082echo "$as_me: CouenneLib DEPENDENCIES are $COUENNELIB_DEPENDENCIES" >&6;}
    2305223083
    2305323084  fi
     
    2374323774  CPXINCDIR=`cd $withval; pwd`
    2374423775fi;
     23776
    2374523777
    2374623778# other LP solvers
     
    2665226684s,@COIN_HAS_CPX_TRUE@,$COIN_HAS_CPX_TRUE,;t t
    2665326685s,@COIN_HAS_CPX_FALSE@,$COIN_HAS_CPX_FALSE,;t t
     26686s,@CPXINCDIR@,$CPXINCDIR,;t t
    2665426687s,@GRB_LIBS@,$GRB_LIBS,;t t
    2665526688s,@GRB_CFLAGS@,$GRB_CFLAGS,;t t
  • branches/split/Couenne/configure.ac

    r479 r480  
    7171
    7272# Bonmin AMPL interface
    73 AC_COIN_CHECK_PACKAGE(ASL, [bonminamplinterface])
     73# bad bad: if AMPL stuff is available, then libCouenne will depend on it, so we add it to CouenneLib
     74AC_COIN_CHECK_PACKAGE(ASL, [bonminamplinterface], [CouenneLib])
    7475
    7576# Nauty library (for symmetry detection)
     
    8384  [AS_HELP_STRING([cplex-incdir], [specify the header file directory for library cplex])],
    8485  [CPXINCDIR=`cd $withval; pwd`])
     86AC_SUBST(CPXINCDIR)
    8587
    8688# other LP solvers
  • branches/split/Couenne/couenne-uninstalled.pc.in

    r478 r480  
    66URL: https://projects.coin-or.org/Couenne
    77Version: @PACKAGE_VERSION@
    8 Libs: ${libdir}/libCouenne.la @COUENNELIB_PCLIBS@
    9 Cflags: -I@abs_source_dir@/src -I@ABSBUILDDIR@/inc
     8Libs: ${libdir}/main/libBonCouenne.la ${libdir}/libCouenne.la @COUENNELIB_PCLIBS@
     9Cflags: -I@abs_source_dir@/src -I@abs_source_dir@/src/main -I@abs_source_dir@/src/expression -I@abs_source_dir@/src/expression/operators -I@abs_source_dir@/src/problem -I@abs_source_dir@/src/convex -I@abs_source_dir@/src/interfaces -I@ABSBUILDDIR@/inc
    1010Requires: @COUENNELIB_PCREQUIRES@
  • branches/split/Couenne/couenne.pc.in

    r478 r480  
    88URL: https://projects.coin-or.org/Couenne
    99Version: @PACKAGE_VERSION@
    10 Libs: -L${libdir} -lCouenne @COUENNELIB_PCLIBS@
     10Libs: -L${libdir} -lBonCouenne -lCouenne @COUENNELIB_PCLIBS@
    1111Cflags: -I${includedir}
    1212Requires: @COUENNELIB_PCREQUIRES@
  • branches/split/Couenne/src/Makefile.in

    r478 r480  
    221221CPP = @CPP@
    222222CPPFLAGS = @CPPFLAGS@
     223CPXINCDIR = @CPXINCDIR@
    223224CPX_CFLAGS = @CPX_CFLAGS@
    224225CPX_CFLAGS_INSTALLED = @CPX_CFLAGS_INSTALLED@
  • branches/split/Couenne/src/bound_tightening/Makefile.am

    r479 r480  
    3838# "cygpath" stuff is necessary to compile with native compilers on Windows
    3939AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     40        -I`$(CYGPATH_W) $(srcdir)/..` \
    4041        -I`$(CYGPATH_W) $(srcdir)/../problem` \
    4142        -I`$(CYGPATH_W) $(srcdir)/../convex` \
  • branches/split/Couenne/src/bound_tightening/Makefile.in

    r478 r480  
    149149CPP = @CPP@
    150150CPPFLAGS = @CPPFLAGS@
     151CPXINCDIR = @CPXINCDIR@
    151152CPX_CFLAGS = @CPX_CFLAGS@
    152153CPX_CFLAGS_INSTALLED = @CPX_CFLAGS_INSTALLED@
     
    331332# "cygpath" stuff is necessary to compile with native compilers on Windows
    332333AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     334        -I`$(CYGPATH_W) $(srcdir)/..` \
    333335        -I`$(CYGPATH_W) $(srcdir)/../problem` \
    334336        -I`$(CYGPATH_W) $(srcdir)/../convex` \
  • branches/split/Couenne/src/branch/Makefile.am

    r479 r480  
    5151# "cygpath" stuff is necessary to compile with native compilers on Windows
    5252AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     53        -I`$(CYGPATH_W) $(srcdir)/..` \
    5354        -I`$(CYGPATH_W) $(srcdir)/../convex` \
    5455        -I`$(CYGPATH_W) $(srcdir)/../expression` \
  • branches/split/Couenne/src/branch/Makefile.in

    r478 r480  
    157157CPP = @CPP@
    158158CPPFLAGS = @CPPFLAGS@
     159CPXINCDIR = @CPXINCDIR@
    159160CPX_CFLAGS = @CPX_CFLAGS@
    160161CPX_CFLAGS_INSTALLED = @CPX_CFLAGS_INSTALLED@
     
    337338# "cygpath" stuff is necessary to compile with native compilers on Windows
    338339AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     340        -I`$(CYGPATH_W) $(srcdir)/..` \
    339341        -I`$(CYGPATH_W) $(srcdir)/../convex` \
    340342        -I`$(CYGPATH_W) $(srcdir)/../expression` \
  • branches/split/Couenne/src/convex/Makefile.am

    r479 r480  
    4949# "cygpath" stuff is necessary to compile with native compilers on Windows
    5050AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     51        -I`$(CYGPATH_W) $(srcdir)/..` \
    5152        -I`$(CYGPATH_W) $(srcdir)/../bound_tightening` \
    5253        -I`$(CYGPATH_W) $(srcdir)/../expression` \
  • branches/split/Couenne/src/convex/Makefile.in

    r478 r480  
    142142CPP = @CPP@
    143143CPPFLAGS = @CPPFLAGS@
     144CPXINCDIR = @CPXINCDIR@
    144145CPX_CFLAGS = @CPX_CFLAGS@
    145146CPX_CFLAGS_INSTALLED = @CPX_CFLAGS_INSTALLED@
     
    334335# "cygpath" stuff is necessary to compile with native compilers on Windows
    335336AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     337        -I`$(CYGPATH_W) $(srcdir)/..` \
    336338        -I`$(CYGPATH_W) $(srcdir)/../bound_tightening` \
    337339        -I`$(CYGPATH_W) $(srcdir)/../expression` \
  • branches/split/Couenne/src/crossconv/Makefile.am

    r478 r480  
    2121# "cygpath" stuff is necessary to compile with native compilers on Windows
    2222AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     23        -I`$(CYGPATH_W) $(srcdir)/..` \
    2324        -I`$(CYGPATH_W) $(srcdir)/../convex` \
    2425        -I`$(CYGPATH_W) $(srcdir)/../heuristics` \
  • branches/split/Couenne/src/crossconv/Makefile.in

    r478 r480  
    141141CPP = @CPP@
    142142CPPFLAGS = @CPPFLAGS@
     143CPXINCDIR = @CPXINCDIR@
    143144CPX_CFLAGS = @CPX_CFLAGS@
    144145CPX_CFLAGS_INSTALLED = @CPX_CFLAGS_INSTALLED@
     
    306307# "cygpath" stuff is necessary to compile with native compilers on Windows
    307308AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     309        -I`$(CYGPATH_W) $(srcdir)/..` \
    308310        -I`$(CYGPATH_W) $(srcdir)/../convex` \
    309311        -I`$(CYGPATH_W) $(srcdir)/../heuristics` \
  • branches/split/Couenne/src/disjunctive/Makefile.am

    r479 r480  
    2727# "cygpath" stuff is necessary to compile with native compilers on Windows
    2828AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     29        -I`$(CYGPATH_W) $(srcdir)/..` \
    2930        -I`$(CYGPATH_W) $(srcdir)/../convex` \
    3031        -I`$(CYGPATH_W) $(srcdir)/../heuristics` \
  • branches/split/Couenne/src/disjunctive/Makefile.in

    r478 r480  
    144144CPP = @CPP@
    145145CPPFLAGS = @CPPFLAGS@
     146CPXINCDIR = @CPXINCDIR@
    146147CPX_CFLAGS = @CPX_CFLAGS@
    147148CPX_CFLAGS_INSTALLED = @CPX_CFLAGS_INSTALLED@
     
    315316# "cygpath" stuff is necessary to compile with native compilers on Windows
    316317AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     318        -I`$(CYGPATH_W) $(srcdir)/..` \
    317319        -I`$(CYGPATH_W) $(srcdir)/../convex` \
    318320        -I`$(CYGPATH_W) $(srcdir)/../heuristics` \
  • branches/split/Couenne/src/ellipcuts/Makefile.am

    r479 r480  
    1818# "cygpath" stuff is necessary to compile with native compilers on Windows
    1919AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     20        -I`$(CYGPATH_W) $(srcdir)/..` \
    2021        -I`$(CYGPATH_W) $(srcdir)/../convex` \
    2122        -I`$(CYGPATH_W) $(srcdir)/../expression` \
  • branches/split/Couenne/src/ellipcuts/Makefile.in

    r478 r480  
    136136CPP = @CPP@
    137137CPPFLAGS = @CPPFLAGS@
     138CPXINCDIR = @CPXINCDIR@
    138139CPX_CFLAGS = @CPX_CFLAGS@
    139140CPX_CFLAGS_INSTALLED = @CPX_CFLAGS_INSTALLED@
     
    297298# "cygpath" stuff is necessary to compile with native compilers on Windows
    298299AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     300        -I`$(CYGPATH_W) $(srcdir)/..` \
    299301        -I`$(CYGPATH_W) $(srcdir)/../convex` \
    300302        -I`$(CYGPATH_W) $(srcdir)/../expression` \
  • branches/split/Couenne/src/expression/Makefile.am

    r479 r480  
    8484# "cygpath" stuff is necessary to compile with native compilers on Windows
    8585AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     86        -I`$(CYGPATH_W) $(srcdir)/..` \
    8687        -I`$(CYGPATH_W) $(srcdir)/../convex` \
    8788        -I`$(CYGPATH_W) $(srcdir)/../convex/operators` \
  • branches/split/Couenne/src/expression/Makefile.in

    r478 r480  
    160160CPP = @CPP@
    161161CPPFLAGS = @CPPFLAGS@
     162CPXINCDIR = @CPXINCDIR@
    162163CPX_CFLAGS = @CPX_CFLAGS@
    163164CPX_CFLAGS_INSTALLED = @CPX_CFLAGS_INSTALLED@
     
    388389# "cygpath" stuff is necessary to compile with native compilers on Windows
    389390AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     391        -I`$(CYGPATH_W) $(srcdir)/..` \
    390392        -I`$(CYGPATH_W) $(srcdir)/../convex` \
    391393        -I`$(CYGPATH_W) $(srcdir)/../convex/operators` \
  • branches/split/Couenne/src/heuristics/Makefile.am

    r479 r480  
    2525# Here list all include flags, relative to this "srcdir" directory.  This
    2626# "cygpath" stuff is necessary to compile with native compilers on Windows
    27 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     27AM_CPPFLAGS = $(COUENNELIB_CFLAGS) $(ASL_CFLAGS) \
     28        -I`$(CYGPATH_W) $(srcdir)/..` \
    2829        -I`$(CYGPATH_W) $(srcdir)/../convex` \
    2930        -I`$(CYGPATH_W) $(srcdir)/../expression` \
  • branches/split/Couenne/src/heuristics/Makefile.in

    r478 r480  
    144144CPP = @CPP@
    145145CPPFLAGS = @CPPFLAGS@
     146CPXINCDIR = @CPXINCDIR@
    146147CPX_CFLAGS = @CPX_CFLAGS@
    147148CPX_CFLAGS_INSTALLED = @CPX_CFLAGS_INSTALLED@
     
    313314# Here list all include flags, relative to this "srcdir" directory.  This
    314315# "cygpath" stuff is necessary to compile with native compilers on Windows
    315 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     316AM_CPPFLAGS = $(COUENNELIB_CFLAGS) $(ASL_CFLAGS) \
     317        -I`$(CYGPATH_W) $(srcdir)/..` \
    316318        -I`$(CYGPATH_W) $(srcdir)/../convex` \
    317319        -I`$(CYGPATH_W) $(srcdir)/../expression` \
  • branches/split/Couenne/src/interfaces/Makefile.am

    r479 r480  
    2020# Here list all include flags, relative to this "srcdir" directory.  This
    2121# "cygpath" stuff is necessary to compile with native compilers on Windows
    22 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     22AM_CPPFLAGS = $(COUENNELIB_CFLAGS) $(ASL_CFLAGS) \
    2323        -I`$(CYGPATH_W) $(srcdir)/..` \
    2424        -I`$(CYGPATH_W) $(srcdir)/../convex` \
  • branches/split/Couenne/src/interfaces/Makefile.in

    r478 r480  
    142142CPP = @CPP@
    143143CPPFLAGS = @CPPFLAGS@
     144CPXINCDIR = @CPXINCDIR@
    144145CPX_CFLAGS = @CPX_CFLAGS@
    145146CPX_CFLAGS_INSTALLED = @CPX_CFLAGS_INSTALLED@
     
    306307# Here list all include flags, relative to this "srcdir" directory.  This
    307308# "cygpath" stuff is necessary to compile with native compilers on Windows
    308 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     309AM_CPPFLAGS = $(COUENNELIB_CFLAGS) $(ASL_CFLAGS) \
    309310        -I`$(CYGPATH_W) $(srcdir)/..` \
    310311        -I`$(CYGPATH_W) $(srcdir)/../convex` \
  • branches/split/Couenne/src/main/BonCouenne.cpp

    r479 r480  
    2121#include <stdlib.h>
    2222
     23#include "CouenneConfig.h"
     24
    2325#include "CoinTime.hpp"
    2426#include "CoinError.hpp"
     
    4749#include "CouenneJournalist.hpp"
    4850
    49 #include "config_couenne.h"
    50 
    5151int main (int argc, char *argv[]) {
    5252
    5353    printf ("Couenne %s --  an Open-Source exact solver for MINLP\n",
    54             strcmp (PACKAGE_VERSION, "trunk") ? PACKAGE_VERSION : "");
     54            strcmp (COUENNE_VERSION, "trunk") ? COUENNE_VERSION : "");
    5555
    5656    printf ("\
    57 Mailing list: %s\n\
    58 Instructions: http://www.coin-or.org/Couenne\n",
    59             PACKAGE_BUGREPORT);
    60 
    61   //WindowsErrorPopupBlocker();
     57Mailing list: couenne@list.coin-or.org\n\
     58Instructions: http://www.coin-or.org/Couenne\n");
     59
     60  WindowsErrorPopupBlocker();
    6261  using namespace Ipopt;
    6362
  • branches/split/Couenne/src/main/Makefile.am

    r479 r480  
    1111# what is built at this level
    1212
    13 if COIN_HAS_ASL
    14   bin_PROGRAMS = couenne couenne2
    15 endif
    16 
    1713lib_LTLIBRARIES = libBonCouenne.la
    1814
     
    2117        SmartAslDestr.cpp
    2218
     19if COIN_HAS_ASL
     20  bin_PROGRAMS = couenne
     21  #couenne2
     22endif
     23
     24couenne_SOURCES = BonCouenne.cpp
    2325couenne_LDADD         = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_LIBS)         $(ASL_LIBS)
    2426couenne_DEPENDENCIES  = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_DEPENDENCIES) $(ASL_DEPENDENCIES)
    2527
    26 couenne_SOURCES = BonCouenne.cpp
    27 
    28 couenne2_LDADD         = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_LIBS)         $(ASL_LIBS)
    29 couenne2_DEPENDENCIES  = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_DEPENDENCIES) $(ASL_DEPENDENCIES)
    30 
    31 couenne2_SOURCES = \
    32         Couenne.cpp \
    33         CouenneOSInterface.cpp
    34 
    35 #       ../readnl/readnl.cpp
     28#couenne2_SOURCES = Couenne.cpp CouenneOSInterface.cpp
     29#couenne2_LDADD         = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_LIBS)         $(ASL_LIBS)
     30#couenne2_DEPENDENCIES  = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_DEPENDENCIES) $(ASL_DEPENDENCIES)
    3631
    3732# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    3934# libraries.
    4035couenne_LDFLAGS = -rpath $(libdir)
    41 couenne2_LDFLAGS = -rpath $(libdir)
     36#couenne2_LDFLAGS = -rpath $(libdir)
    4237
    4338# Here list all include flags, relative to this "srcdir" directory.  This
  • branches/split/Couenne/src/main/Makefile.in

    r478 r480  
    4444build_triplet = @build@
    4545host_triplet = @host@
    46 @COIN_HAS_ASL_TRUE@bin_PROGRAMS = couenne$(EXEEXT) couenne2$(EXEEXT)
     46@COIN_HAS_ASL_TRUE@bin_PROGRAMS = couenne$(EXEEXT)
    4747subdir = src/main
    4848DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
     
    7272couenne_OBJECTS = $(am_couenne_OBJECTS)
    7373am__DEPENDENCIES_1 =
    74 am_couenne2_OBJECTS = Couenne.$(OBJEXT) CouenneOSInterface.$(OBJEXT)
    75 couenne2_OBJECTS = $(am_couenne2_OBJECTS)
    7674depcomp = $(SHELL) $(top_srcdir)/depcomp
    7775am__depfiles_maybe = depfiles
     
    8482CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
    8583        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    86 SOURCES = $(libBonCouenne_la_SOURCES) $(couenne_SOURCES) \
    87         $(couenne2_SOURCES)
    88 DIST_SOURCES = $(libBonCouenne_la_SOURCES) $(couenne_SOURCES) \
    89         $(couenne2_SOURCES)
     84SOURCES = $(libBonCouenne_la_SOURCES) $(couenne_SOURCES)
     85DIST_SOURCES = $(libBonCouenne_la_SOURCES) $(couenne_SOURCES)
    9086ETAGS = etags
    9187CTAGS = ctags
     
    159155CPP = @CPP@
    160156CPPFLAGS = @CPPFLAGS@
     157CPXINCDIR = @CPXINCDIR@
    161158CPX_CFLAGS = @CPX_CFLAGS@
    162159CPX_CFLAGS_INSTALLED = @CPX_CFLAGS_INSTALLED@
     
    309306target_alias = @target_alias@
    310307AUTOMAKE_OPTIONS = foreign
     308
     309# what is built at this level
    311310lib_LTLIBRARIES = libBonCouenne.la
    312311libBonCouenne_la_SOURCES = \
     
    314313        SmartAslDestr.cpp
    315314
     315couenne_SOURCES = BonCouenne.cpp
    316316couenne_LDADD = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_LIBS)         $(ASL_LIBS)
    317317couenne_DEPENDENCIES = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_DEPENDENCIES) $(ASL_DEPENDENCIES)
    318 couenne_SOURCES = BonCouenne.cpp
    319 couenne2_LDADD = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_LIBS)         $(ASL_LIBS)
    320 couenne2_DEPENDENCIES = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_DEPENDENCIES) $(ASL_DEPENDENCIES)
    321 couenne2_SOURCES = \
    322         Couenne.cpp \
    323         CouenneOSInterface.cpp
    324 
    325 
    326 #       ../readnl/readnl.cpp
     318
     319#couenne2_SOURCES = Couenne.cpp CouenneOSInterface.cpp
     320#couenne2_LDADD         = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_LIBS)         $(ASL_LIBS)
     321#couenne2_DEPENDENCIES  = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_DEPENDENCIES) $(ASL_DEPENDENCIES)
    327322
    328323# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    330325# libraries.
    331326couenne_LDFLAGS = -rpath $(libdir)
    332 couenne2_LDFLAGS = -rpath $(libdir)
     327#couenne2_LDFLAGS = -rpath $(libdir)
    333328
    334329# Here list all include flags, relative to this "srcdir" directory.  This
     
    446441        @rm -f couenne$(EXEEXT)
    447442        $(CXXLINK) $(couenne_LDFLAGS) $(couenne_OBJECTS) $(couenne_LDADD) $(LIBS)
    448 couenne2$(EXEEXT): $(couenne2_OBJECTS) $(couenne2_DEPENDENCIES)
    449         @rm -f couenne2$(EXEEXT)
    450         $(CXXLINK) $(couenne2_LDFLAGS) $(couenne2_OBJECTS) $(couenne2_LDADD) $(LIBS)
    451443
    452444mostlyclean-compile:
     
    458450@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonCouenne.Po@am__quote@
    459451@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonCouenneSetup.Plo@am__quote@
    460 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Couenne.Po@am__quote@
    461 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CouenneOSInterface.Po@am__quote@
    462452@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SmartAslDestr.Plo@am__quote@
    463453
     
    667657        uninstall-libLTLIBRARIES
    668658
     659@COIN_HAS_ASL_TRUE@  #couenne2
    669660# Tell versions [3.59,3.63) of GNU make to not export all variables.
    670661# Otherwise a system limit (for SysV at least) may be exceeded.
  • branches/split/Couenne/src/problem/CouenneProblem.hpp

    r479 r480  
    1616#include <map>
    1717
     18#include "CouenneConfig.h"
     19
    1820#include "CouenneTypes.hpp"
    1921#include "CouenneExpression.hpp"
     
    2123#include "CouenneJournalist.hpp"
    2224#include "CouenneDomain.hpp"
    23 
    24 // this is temporary and is aimed at overriding all definitions from
    25 // Ipopt with those of Couenne
    26 
    27 #undef PACKAGE
    28 #undef PACKAGE_BUGREPORT
    29 #undef PACKAGE_VERSION
    30 #undef PACKAGE_TARNAME
    31 #undef PACKAGE_NAME
    32 #undef PACKAGE_STRING
    33 #undef VERSION
    34 
    35 #include "config_couenne.h"
    3625
    3726namespace Ipopt {
  • branches/split/Couenne/src/problem/Makefile.am

    r479 r480  
    5555# "cygpath" stuff is necessary to compile with native compilers on Windows
    5656AM_CPPFLAGS = $(COUENNELIB_CFLAGS) $(ASL_CFLAGS) \
     57        -I`$(CYGPATH_W) $(srcdir)/..` \
    5758        -I`$(CYGPATH_W) $(srcdir)/../convex` \
    5859        -I`$(CYGPATH_W) $(srcdir)/../expression` \
  • branches/split/Couenne/src/problem/Makefile.in

    r478 r480  
    173173CPP = @CPP@
    174174CPPFLAGS = @CPPFLAGS@
     175CPXINCDIR = @CPXINCDIR@
    175176CPX_CFLAGS = @CPX_CFLAGS@
    176177CPX_CFLAGS_INSTALLED = @CPX_CFLAGS_INSTALLED@
     
    340341# "cygpath" stuff is necessary to compile with native compilers on Windows
    341342AM_CPPFLAGS = $(COUENNELIB_CFLAGS) $(ASL_CFLAGS) \
     343        -I`$(CYGPATH_W) $(srcdir)/..` \
    342344        -I`$(CYGPATH_W) $(srcdir)/../convex` \
    343345        -I`$(CYGPATH_W) $(srcdir)/../expression` \
  • branches/split/Couenne/src/problem/reformulate.cpp

    r479 r480  
    1010#include <vector>
    1111
     12#include "CouenneConfig.h"
     13
    1214#include "CoinHelperFunctions.hpp"
    1315#include "CoinTime.hpp"
    1416
    1517#include "BonBabSetupBase.hpp"
    16 
    17 #include "config_couenne.h"
    1818
    1919#include "CouenneTypes.hpp"
  • branches/split/Couenne/src/readnl/Makefile.in

    r478 r480  
    148148CPP = @CPP@
    149149CPPFLAGS = @CPPFLAGS@
     150CPXINCDIR = @CPXINCDIR@
    150151CPX_CFLAGS = @CPX_CFLAGS@
    151152CPX_CFLAGS_INSTALLED = @CPX_CFLAGS_INSTALLED@
  • branches/split/Couenne/src/sdpcuts/Makefile.am

    r479 r480  
    3737# "cygpath" stuff is necessary to compile with native compilers on Windows
    3838AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     39        -I`$(CYGPATH_W) $(srcdir)/..` \
    3940        -I`$(CYGPATH_W) $(srcdir)/../convex` \
    4041        -I`$(CYGPATH_W) $(srcdir)/../problem`
  • branches/split/Couenne/src/sdpcuts/Makefile.in

    r478 r480  
    143143CPP = @CPP@
    144144CPPFLAGS = @CPPFLAGS@
     145CPXINCDIR = @CPXINCDIR@
    145146CPX_CFLAGS = @CPX_CFLAGS@
    146147CPX_CFLAGS_INSTALLED = @CPX_CFLAGS_INSTALLED@
     
    323324# "cygpath" stuff is necessary to compile with native compilers on Windows
    324325AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     326        -I`$(CYGPATH_W) $(srcdir)/..` \
    325327        -I`$(CYGPATH_W) $(srcdir)/../convex` \
    326328        -I`$(CYGPATH_W) $(srcdir)/../problem`
  • branches/split/Couenne/src/standardize/Makefile.am

    r479 r480  
    2828# "cygpath" stuff is necessary to compile with native compilers on Windows
    2929AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     30        -I`$(CYGPATH_W) $(srcdir)/..` \
    3031        -I`$(CYGPATH_W) $(srcdir)/../expression` \
    3132        -I`$(CYGPATH_W) $(srcdir)/../expression/operators` \
  • branches/split/Couenne/src/standardize/Makefile.in

    r478 r480  
    144144CPP = @CPP@
    145145CPPFLAGS = @CPPFLAGS@
     146CPXINCDIR = @CPXINCDIR@
    146147CPX_CFLAGS = @CPX_CFLAGS@
    147148CPX_CFLAGS_INSTALLED = @CPX_CFLAGS_INSTALLED@
     
    316317# "cygpath" stuff is necessary to compile with native compilers on Windows
    317318AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     319        -I`$(CYGPATH_W) $(srcdir)/..` \
    318320        -I`$(CYGPATH_W) $(srcdir)/../expression` \
    319321        -I`$(CYGPATH_W) $(srcdir)/../expression/operators` \
  • branches/split/Couenne/src/two_implied_bt/Makefile.am

    r478 r480  
    2323# "cygpath" stuff is necessary to compile with native compilers on Windows
    2424AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     25        -I`$(CYGPATH_W) $(srcdir)/..` \
    2526        -I`$(CYGPATH_W) $(srcdir)/../expression` \
    2627        -I`$(CYGPATH_W) $(srcdir)/../branch`\
  • branches/split/Couenne/src/two_implied_bt/Makefile.in

    r478 r480  
    1515@SET_MAKE@
    1616
    17 # $Id: Makefile.am 441 2010-10-23 14:01:38Z pbelotti $
     17# $Id: Makefile.am 478 2011-01-08 23:10:13Z stefan $
    1818#
    1919# Copyright (C) 2006 International Business Machines and others.
     
    144144CPP = @CPP@
    145145CPPFLAGS = @CPPFLAGS@
     146CPXINCDIR = @CPXINCDIR@
    146147CPX_CFLAGS = @CPX_CFLAGS@
    147148CPX_CFLAGS_INSTALLED = @CPX_CFLAGS_INSTALLED@
     
    309310# "cygpath" stuff is necessary to compile with native compilers on Windows
    310311AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     312        -I`$(CYGPATH_W) $(srcdir)/..` \
    311313        -I`$(CYGPATH_W) $(srcdir)/../expression` \
    312314        -I`$(CYGPATH_W) $(srcdir)/../branch`\
  • branches/split/Couenne/src/util/Makefile.am

    r479 r480  
    2020# "cygpath" stuff is necessary to compile with native compilers on Windows
    2121AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     22        -I`$(CYGPATH_W) $(srcdir)/..` \
    2223        -I`$(CYGPATH_W) $(srcdir)/../expression` \
    2324        -I`$(CYGPATH_W) $(srcdir)/../convex` \
  • branches/split/Couenne/src/util/Makefile.in

    r478 r480  
    140140CPP = @CPP@
    141141CPPFLAGS = @CPPFLAGS@
     142CPXINCDIR = @CPXINCDIR@
    142143CPX_CFLAGS = @CPX_CFLAGS@
    143144CPX_CFLAGS_INSTALLED = @CPX_CFLAGS_INSTALLED@
     
    304305# "cygpath" stuff is necessary to compile with native compilers on Windows
    305306AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     307        -I`$(CYGPATH_W) $(srcdir)/..` \
    306308        -I`$(CYGPATH_W) $(srcdir)/../expression` \
    307309        -I`$(CYGPATH_W) $(srcdir)/../convex` \
  • branches/split/Couenne/test/Makefile.in

    r478 r480  
    124124CPP = @CPP@
    125125CPPFLAGS = @CPPFLAGS@
     126CPXINCDIR = @CPXINCDIR@
    126127CPX_CFLAGS = @CPX_CFLAGS@
    127128CPX_CFLAGS_INSTALLED = @CPX_CFLAGS_INSTALLED@
Note: See TracChangeset for help on using the changeset viewer.