Changeset 1233:490d89913a17 in lemon for test/CMakeLists.txt
- Timestamp:
- 07/15/13 08:33:08 (11 years ago)
- Branch:
- default
- Parents:
- 1229:473c71baff72 (diff), 1232:fc3854d936f7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Phase:
- public
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
test/CMakeLists.txt
r1228 r1233 70 70 ENDIF() 71 71 IF(LEMON_HAVE_CPLEX) 72 SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${ CPLEX_LIBRARIES})72 SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${ILOG_LIBRARIES}) 73 73 ENDIF() 74 74 IF(LEMON_HAVE_CLP) … … 94 94 GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) 95 95 ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD 96 COMMAND ${CMAKE_COMMAND} -E copy ${ CPLEX_BIN_DIR}/cplex.dll${TARGET_PATH}96 COMMAND ${CMAKE_COMMAND} -E copy ${ILOG_CPLEX_DLL} ${TARGET_PATH} 97 97 ) 98 98 ENDIF() … … 112 112 ENDIF() 113 113 IF(LEMON_HAVE_CPLEX) 114 SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${ CPLEX_LIBRARIES})114 SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${ILOG_LIBRARIES}) 115 115 ENDIF() 116 116 IF(LEMON_HAVE_CBC) … … 136 136 GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) 137 137 ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD 138 COMMAND ${CMAKE_COMMAND} -E copy ${ CPLEX_BIN_DIR}/cplex.dll${TARGET_PATH}138 COMMAND ${CMAKE_COMMAND} -E copy ${ILOG_CPLEX_DLL} ${TARGET_PATH} 139 139 ) 140 140 ENDIF() -
test/CMakeLists.txt
r1230 r1233 17 17 bellman_ford_test 18 18 bfs_test 19 bpgraph_test 19 20 circulation_test 20 21 connectivity_test … … 35 36 heap_test 36 37 kruskal_test 38 lgf_reader_writer_test 37 39 lgf_test 38 40 maps_test … … 40 42 max_cardinality_search_test 41 43 max_clique_test 44 max_flow_test 42 45 min_cost_arborescence_test 43 46 min_cost_flow_test … … 46 49 path_test 47 50 planarity_test 48 preflow_test49 51 radix_sort_test 50 52 random_test 51 53 suurballe_test 52 54 time_measure_test 55 tsp_test 53 56 unionfind_test 54 57 )
Note: See TracChangeset
for help on using the changeset viewer.