equal
deleted
inserted
replaced
43 SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES}) |
43 SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES}) |
44 ENDIF(HAVE_GLPK) |
44 ENDIF(HAVE_GLPK) |
45 IF(HAVE_CPLEX) |
45 IF(HAVE_CPLEX) |
46 SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${CPLEX_LIBRARIES}) |
46 SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${CPLEX_LIBRARIES}) |
47 ENDIF(HAVE_CPLEX) |
47 ENDIF(HAVE_CPLEX) |
|
48 IF(HAVE_CLP) |
|
49 SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${COIN_CLP_LIBRARIES}) |
|
50 ENDIF(HAVE_CLP) |
48 TARGET_LINK_LIBRARIES(lp_test ${LP_TEST_LIBS}) |
51 TARGET_LINK_LIBRARIES(lp_test ${LP_TEST_LIBS}) |
49 ADD_TEST(lp_test lp_test) |
52 ADD_TEST(lp_test lp_test) |
50 |
53 |
51 IF(WIN32 AND HAVE_GLPK) |
54 IF(WIN32 AND HAVE_GLPK) |
52 GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION) |
55 GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION) |
73 SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${GLPK_LIBRARIES}) |
76 SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${GLPK_LIBRARIES}) |
74 ENDIF(HAVE_GLPK) |
77 ENDIF(HAVE_GLPK) |
75 IF(HAVE_CPLEX) |
78 IF(HAVE_CPLEX) |
76 SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${CPLEX_LIBRARIES}) |
79 SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${CPLEX_LIBRARIES}) |
77 ENDIF(HAVE_CPLEX) |
80 ENDIF(HAVE_CPLEX) |
|
81 IF(HAVE_CBC) |
|
82 SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${COIN_CBC_LIBRARIES}) |
|
83 ENDIF(HAVE_CBC) |
78 TARGET_LINK_LIBRARIES(mip_test ${MIP_TEST_LIBS}) |
84 TARGET_LINK_LIBRARIES(mip_test ${MIP_TEST_LIBS}) |
79 ADD_TEST(mip_test mip_test) |
85 ADD_TEST(mip_test mip_test) |
80 |
86 |
81 IF(WIN32 AND HAVE_GLPK) |
87 IF(WIN32 AND HAVE_GLPK) |
82 GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION) |
88 GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION) |