Ignore:
Timestamp:
Sep 13, 2010 3:41:21 AM (9 years ago)
Author:
stefan
Message:

change from COIN_HAS_MODULE to COIN_HAS_PACKAGE

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/test/Makefile.am

    r1467 r1501  
    6060
    6161gamsTest_SOURCES = gamsTest.cpp
    62 gamsTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la $(COINDEPEND_LIBS) $(ADDLIBS)
     62gamsTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_LIBS)
    6363gamsTest_LDFLAGS = -rpath $(libdir)
    6464
     
    6767if COIN_HAS_CLP
    6868  AM_CPPFLAGS += $(CLP_CFLAGS)
    69   gamsTest_LDADD += $(CLP_LIBS)
     69#  gamsTest_LDADD += $(CLP_LIBS)
    7070endif
    7171
    7272if COIN_HAS_CPX
    7373  AM_CPPFLAGS += $(CPX_CFLAGS)
    74   gamsTest_LDADD += $(CPX_LIBS)
     74#  gamsTest_LDADD += $(CPX_LIBS)
    7575endif
    7676
    7777if COIN_HAS_DYLP
    7878  AM_CPPFLAGS += $(DYLP_CFLAGS)
    79   gamsTest_LDADD += $(DYLP_LIBS)
     79#  gamsTest_LDADD += $(DYLP_LIBS)
    8080endif
    8181
    8282if COIN_HAS_GLPK
    8383  AM_CPPFLAGS += $(GLPK_CFLAGS)
    84   gamsTest_LDADD += $(GLPK_LIBS)
     84#  gamsTest_LDADD += $(GLPK_LIBS)
    8585endif
    8686
    8787if COIN_HAS_MSK
    8888  AM_CPPFLAGS += $(MSK_CFLAGS)
    89   gamsTest_LDADD += $(MSK_LIBS)
     89#  gamsTest_LDADD += $(MSK_LIBS)
    9090endif
    9191
     
    9797if COIN_HAS_VOL
    9898  AM_CPPFLAGS += $(VOL_CFLAGS)
    99   gamsTest_LDADD += $(VOL_LIBS)
     99#  gamsTest_LDADD += $(VOL_LIBS)
    100100endif
    101101
    102102if COIN_HAS_XPR
    103103  AM_CPPFLAGS += $(XPR_CFLAGS)
    104   gamsTest_LDADD += $(XPR_LIBS)
    105 endif
    106 
    107 if COIN_HAS_ASL
    108   AM_CPPFLAGS += $(ASL_CFLAGS)
    109   gamsTest_LDADD += $(ASL_LIBS)
     104#  gamsTest_LDADD += $(XPR_LIBS)
    110105endif
    111106
     
    117112
    118113osiUnitTest_LDADD = ../src/OsiCbc/libOsiCbc.la ../src/libCbc.la \
    119     $(COINDEPEND_LIBS) $(OSITESTS_LIBS) $(ADDLIBS)
     114    $(CBCLIB_LIBS) $(OSITESTS_LIBS)
    120115
    121116AM_CPPFLAGS += $(OSITESTS_CFLAGS) \
Note: See TracChangeset for help on using the changeset viewer.