COIN-OR::LEMON - Graph Library

Changeset 1233:490d89913a17 in lemon for test


Ignore:
Timestamp:
07/15/13 08:33:08 (6 years ago)
Author:
Alpar Juttner <alpar@…>
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
Message:

Merge #446, #457, #465

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • test/CMakeLists.txt

    r1228 r1233  
    7070  ENDIF()
    7171  IF(LEMON_HAVE_CPLEX)
    72     SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${CPLEX_LIBRARIES})
     72    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${ILOG_LIBRARIES})
    7373  ENDIF()
    7474  IF(LEMON_HAVE_CLP)
     
    9494    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    9595    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}
    9797    )
    9898  ENDIF()
     
    112112  ENDIF()
    113113  IF(LEMON_HAVE_CPLEX)
    114     SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${CPLEX_LIBRARIES})
     114    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${ILOG_LIBRARIES})
    115115  ENDIF()
    116116  IF(LEMON_HAVE_CBC)
     
    136136    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    137137    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}
    139139    )
    140140  ENDIF()
  • test/CMakeLists.txt

    r1230 r1233  
    1717  bellman_ford_test
    1818  bfs_test
     19  bpgraph_test
    1920  circulation_test
    2021  connectivity_test
     
    3536  heap_test
    3637  kruskal_test
     38  lgf_reader_writer_test
    3739  lgf_test
    3840  maps_test
     
    4042  max_cardinality_search_test
    4143  max_clique_test
     44  max_flow_test
    4245  min_cost_arborescence_test
    4346  min_cost_flow_test
     
    4649  path_test
    4750  planarity_test
    48   preflow_test
    4951  radix_sort_test
    5052  random_test
    5153  suurballe_test
    5254  time_measure_test
     55  tsp_test
    5356  unionfind_test
    5457)
Note: See TracChangeset for help on using the changeset viewer.