Ignore:
Timestamp:
Jan 10, 2011 11:18:44 AM (10 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/configure.ac

    • Property svn:keywords changed from Id to Author Date Id Revision
    r393 r487  
    4040
    4141# Initialization specifically for project main directories
    42 AC_COIN_PROJECTDIR_INIT
     42AC_COIN_PROJECTDIR_INIT(Couenne)
    4343
    4444# Check if user wants to produce debugging code
     
    5858
    5959#############################################################################
    60 #                              COIN components                              #
     60#                            COIN-OR components                             #
    6161#############################################################################
    6262
    63 AC_COIN_HAS_PROJECT(ThirdParty)
    64 AC_COIN_HAS_PROJECT(CoinUtils)
    65 AC_COIN_HAS_PROJECT(Clp)
    66 AC_COIN_HAS_PROJECT(Bonmin)
    67 AC_COIN_HAS_PROJECT(Ipopt)
    68 AC_COIN_HAS_PROJECT(Cbc)
    69 AC_COIN_HAS_PROJECT(Osi)
    70 AC_COIN_HAS_PROJECT(Cgl)
    71 AC_COIN_HAS_PROJECT(Couenne)
     63AC_COIN_CHECK_PACKAGE(Bonmin, [bonmin], [CouenneLib])
     64if test $coin_has_bonmin != yes ; then
     65  AC_MSG_ERROR([Required package Bonmin not available.])
     66fi
    7267
    7368#############################################################################
     
    7570#############################################################################
    7671
    77 # Ampl Solver library
    78 AC_COIN_HAS_ASL
     72# Bonmin AMPL interface
     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])
    7975
    8076# Nauty library (for symmetry detection)
    8177AC_LANG_PUSH(C)
    82 AC_COIN_HAS_USER_LIBRARY([Nauty],[NTY],[nauty.h],[nauty])
     78AC_COIN_CHECK_USER_LIBRARY([Nauty],[NTY],[nauty.h],[nauty],,[CouenneLib])
    8379AC_LANG_POP(C)
    8480
    85 AC_COIN_HAS_USER_LIBRARY([Cplex],[CPX],[cplex.h],[CPXgetstat])         # Cplex library
    86 AC_COIN_HAS_USER_LIBRARY([Gurobi],[GRB],[gurobi_c.h],[GRBgetattrinfo]) # Gurobi library
    87 AC_COIN_HAS_USER_LIBRARY([Mosek],[MSK],[mosek.h],[MSK_openmosek])      # Mosek
    88 AC_COIN_HAS_USER_LIBRARY([Osl],[OSL],[ekk_c_api.h],[ekk_simplex])      # OSL
    89 AC_COIN_HAS_USER_LIBRARY([Soplex],[SPX],[spxsolver.h])                 # Soplex library
    90 AC_COIN_HAS_USER_LIBRARY([Xpress],[XPR],[xprs.h],[XPRSsetintcontrol])  # XpressMP
     81# CPLEX: check for OsiCplex, and check for cplex include dir, so we can include cplex.h
     82AC_COIN_CHECK_PACKAGE(Cpx, [osi-cplex], [CouenneLib])
     83AC_ARG_WITH([cplex-incdir],
     84  [AS_HELP_STRING([--with-cplex-incdir], [specify the header file directory for library cplex])],
     85  [CPXINCDIR=`cd $withval; pwd`])
     86AC_SUBST(CPXINCDIR)
    9187
    92 ##############################################################################
    93 #                   VPATH links for example input files                      #
    94 ##############################################################################
    95 
    96 # In case this is a VPATH configuration we need to make sure that the
    97 # input files for the examples are available in the VPATH directory.
    98 
    99 #AC_COIN_VPATH_LINK(examples/hello.mps)
    100 #AC_COIN_VPATH_LINK(examples/input.130)
     88# other LP solvers
     89AC_COIN_CHECK_PACKAGE(Grb, [osi-gurobi], [CouenneLib])  # Osi/Gurobi
     90AC_COIN_CHECK_PACKAGE(Msk, [osi-mosek],  [CouenneLib])  # Osi/Mosek
     91AC_COIN_CHECK_PACKAGE(Spx, [osi-soplex], [CouenneLib])  # Osi/Soplex
     92AC_COIN_CHECK_PACKAGE(Xpr, [osi-xpress], [CouenneLib])  # Osi/XpressMP
    10193
    10294##############################################################################
     
    126118                 src/Makefile
    127119                 test/grandTest.sh
    128                  couenne_addlibs.txt])
     120                 couenne.pc couenne-uninstalled.pc])
    129121
    130122# Here put the location and name of the configuration header file
Note: See TracChangeset for help on using the changeset viewer.