Ignore:
Timestamp:
Jan 14, 2009 9:37:27 AM (11 years ago)
Author:
stefan
Message:

recognize and link cplex library

File:
1 edited

Legend:

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

    r25 r66  
    3030        $(IPOPTOBJDIR)/src/LinAlg/liblinalg.la
    3131
    32 #if COIN_HAS_CPX
    33 #     COINLIBS += $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    34 #endif
     32if COIN_HAS_CPX
     33     COINLIBS += $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
     34endif
    3535
    3636COINLIBS += \
     
    3838     $(CLPOBJDIR)/src/libClp.la \
    3939     $(COINUTILSOBJDIR)/src/libCoinUtils.la
    40 
    41 #if COIN_HAS_CPX
    42 #COINLIBS += \
    43 #        $(CPXLIB)
    44 #endif
    45 
    4640
    4741#IPOPTLIBS = \
     
    9387        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglPreProcess`
    9488
    95 #if COIN_HAS_CPX
    96 #  AM_CPPFLAGS += \
    97 #       -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx` \
    98 #       -I`$(CYGPATH_W) $(CPXINCDIR)`
    99 #endif
     89if COIN_HAS_CPX
     90  AM_CPPFLAGS += \
     91        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx` \
     92        -I`$(CYGPATH_W) $(CPXINCDIR)`
     93endif
    10094
    10195AM_CPPFLAGS += $(ASL_CPPFLAGS)
Note: See TracChangeset for help on using the changeset viewer.