Changeset 1501 for trunk/Cbc/test/Makefile.am
- Timestamp:
- Sep 13, 2010 3:41:21 AM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Cbc/test/Makefile.am
r1467 r1501 60 60 61 61 gamsTest_SOURCES = gamsTest.cpp 62 gamsTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la $(C OINDEPEND_LIBS) $(ADDLIBS)62 gamsTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_LIBS) 63 63 gamsTest_LDFLAGS = -rpath $(libdir) 64 64 … … 67 67 if COIN_HAS_CLP 68 68 AM_CPPFLAGS += $(CLP_CFLAGS) 69 gamsTest_LDADD += $(CLP_LIBS)69 # gamsTest_LDADD += $(CLP_LIBS) 70 70 endif 71 71 72 72 if COIN_HAS_CPX 73 73 AM_CPPFLAGS += $(CPX_CFLAGS) 74 gamsTest_LDADD += $(CPX_LIBS)74 # gamsTest_LDADD += $(CPX_LIBS) 75 75 endif 76 76 77 77 if COIN_HAS_DYLP 78 78 AM_CPPFLAGS += $(DYLP_CFLAGS) 79 gamsTest_LDADD += $(DYLP_LIBS)79 # gamsTest_LDADD += $(DYLP_LIBS) 80 80 endif 81 81 82 82 if COIN_HAS_GLPK 83 83 AM_CPPFLAGS += $(GLPK_CFLAGS) 84 gamsTest_LDADD += $(GLPK_LIBS)84 # gamsTest_LDADD += $(GLPK_LIBS) 85 85 endif 86 86 87 87 if COIN_HAS_MSK 88 88 AM_CPPFLAGS += $(MSK_CFLAGS) 89 gamsTest_LDADD += $(MSK_LIBS)89 # gamsTest_LDADD += $(MSK_LIBS) 90 90 endif 91 91 … … 97 97 if COIN_HAS_VOL 98 98 AM_CPPFLAGS += $(VOL_CFLAGS) 99 gamsTest_LDADD += $(VOL_LIBS)99 # gamsTest_LDADD += $(VOL_LIBS) 100 100 endif 101 101 102 102 if COIN_HAS_XPR 103 103 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) 110 105 endif 111 106 … … 117 112 118 113 osiUnitTest_LDADD = ../src/OsiCbc/libOsiCbc.la ../src/libCbc.la \ 119 $(C OINDEPEND_LIBS) $(OSITESTS_LIBS) $(ADDLIBS)114 $(CBCLIB_LIBS) $(OSITESTS_LIBS) 120 115 121 116 AM_CPPFLAGS += $(OSITESTS_CFLAGS) \
Note: See TracChangeset
for help on using the changeset viewer.