Ignore:
Timestamp:
Jun 1, 2011 1:53:43 PM (9 years ago)
Author:
pbelotti
Message:

adding configure/make options for SCIP. Adding two (empty for now) operators

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/main/Makefile.am

    r594 r595  
    1919if COIN_HAS_ASL
    2020  bin_PROGRAMS = couenne
    21   #couenne2
    2221endif
    2322
    2423couenne_SOURCES = BonCouenne.cpp
    25 couenne_LDADD         = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_LIBS)        $(ASL_LIBS)
     24couenne_LDADD   = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_LIBS) $(ASL_LIBS)
    2625
    27 if COIN_HAS_SCIP
    28 couenne_LDADD +=
    29         /nfs/optimi/kombadon/bzfberth/projects/ziboptsuite-2.0.1/scip-2.0.1/lib/libscip-2.0.1.linux.x86_64.gnu.opt-shared.so \
    30         /nfs/optimi/kombadon/bzfberth/projects/ziboptsuite-2.0.1/scip-2.0.1/lib/liblpispx-2.0.1.linux.x86_64.gnu.opt-shared.so \
    31         /nfs/optimi/kombadon/bzfberth/projects/ziboptsuite-2.0.1/scip-2.0.1/lib/libnlpi-2.0.1.linux.x86_64.gnu.opt-shared.so \
    32         /nfs/optimi/kombadon/bzfberth/projects/ziboptsuite-2.0.1/scip-2.0.1/lib/libobjscip-2.0.1.linux.x86_64.gnu.opt-shared.so \
    33         /nfs/optimi/kombadon/bzfberth/projects/ziboptsuite-2.0.1/soplex-1.5.0/lib/libsoplex-1.5.0.linux.x86_64.gnu.opt-shared.so
     26if COIN_HAS_SCP
     27couenne_LDADD += \
     28        $(SCPLIBDIR)/libscip-2.0.1.linux.x86_64.gnu.opt-shared.so \
     29        $(SCPLIBDIR)/liblpispx-2.0.1.linux.x86_64.gnu.opt-shared.so \
     30        $(SCPLIBDIR)/libnlpi-2.0.1.linux.x86_64.gnu.opt-shared.so \
     31        $(SCPLIBDIR)/libobjscip-2.0.1.linux.x86_64.gnu.opt-shared.so
    3432endif
    3533
     34if COIN_HAS_SPX
     35couenne_LDADD += \
     36        $(SPXLIBDIR)/libsoplex-1.5.0.linux.x86_64.gnu.opt-shared.so
     37endif
    3638
    3739couenne_DEPENDENCIES  = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_DEPENDENCIES) $(ASL_DEPENDENCIES)
    38 
    39 #couenne2_SOURCES = Couenne.cpp CouenneOSInterface.cpp
    40 #couenne2_LDADD         = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_LIBS)         $(ASL_LIBS)
    41 #couenne2_DEPENDENCIES  = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_DEPENDENCIES) $(ASL_DEPENDENCIES)
    4240
    4341# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    4543# libraries.
    4644couenne_LDFLAGS = -rpath $(libdir)
    47 #couenne2_LDFLAGS = -rpath $(libdir)
    4845
    4946# Here list all include flags, relative to this "srcdir" directory.  This
Note: See TracChangeset for help on using the changeset viewer.