1.1 --- a/test/CMakeLists.txt	Mon Jul 16 16:21:40 2018 +0200
     1.2 +++ b/test/CMakeLists.txt	Wed Oct 17 19:14:07 2018 +0200
     1.3 @@ -16,6 +16,7 @@
     1.4    arc_look_up_test
     1.5    bellman_ford_test
     1.6    bfs_test
     1.7 +  bpgraph_test
     1.8    circulation_test
     1.9    connectivity_test
    1.10    counter_test
    1.11 @@ -34,19 +35,24 @@
    1.12    hao_orlin_test
    1.13    heap_test
    1.14    kruskal_test
    1.15 +  lgf_reader_writer_test
    1.16    lgf_test
    1.17    maps_test
    1.18    matching_test
    1.19 +  max_cardinality_search_test
    1.20 +  max_clique_test
    1.21 +  max_flow_test
    1.22    min_cost_arborescence_test
    1.23    min_cost_flow_test
    1.24    min_mean_cycle_test
    1.25 +  nagamochi_ibaraki_test
    1.26    path_test
    1.27    planarity_test
    1.28 -  preflow_test
    1.29    radix_sort_test
    1.30    random_test
    1.31    suurballe_test
    1.32    time_measure_test
    1.33 +  tsp_test
    1.34    unionfind_test
    1.35  )
    1.36  
    1.37 @@ -63,11 +69,14 @@
    1.38      SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES})
    1.39    ENDIF()
    1.40    IF(LEMON_HAVE_CPLEX)
    1.41 -    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${CPLEX_LIBRARIES})
    1.42 +    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${ILOG_LIBRARIES})
    1.43    ENDIF()
    1.44    IF(LEMON_HAVE_CLP)
    1.45      SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${COIN_CLP_LIBRARIES})
    1.46    ENDIF()
    1.47 +  IF(LEMON_HAVE_SOPLEX)
    1.48 +    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${SOPLEX_LIBRARIES})
    1.49 +  ENDIF()
    1.50  
    1.51    TARGET_LINK_LIBRARIES(lp_test ${LP_TEST_LIBS})
    1.52    ADD_TEST(lp_test lp_test)
    1.53 @@ -87,7 +96,7 @@
    1.54      GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
    1.55      GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    1.56      ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
    1.57 -      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH}
    1.58 +      COMMAND ${CMAKE_COMMAND} -E copy ${ILOG_CPLEX_DLL} ${TARGET_PATH}
    1.59      )
    1.60    ENDIF()
    1.61  ENDIF()
    1.62 @@ -105,7 +114,7 @@
    1.63      SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${GLPK_LIBRARIES})
    1.64    ENDIF()
    1.65    IF(LEMON_HAVE_CPLEX)
    1.66 -    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${CPLEX_LIBRARIES})
    1.67 +    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${ILOG_LIBRARIES})
    1.68    ENDIF()
    1.69    IF(LEMON_HAVE_CBC)
    1.70      SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${COIN_CBC_LIBRARIES})
    1.71 @@ -129,7 +138,7 @@
    1.72      GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
    1.73      GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    1.74      ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
    1.75 -      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH}
    1.76 +      COMMAND ${CMAKE_COMMAND} -E copy ${ILOG_CPLEX_DLL} ${TARGET_PATH}
    1.77      )
    1.78    ENDIF()
    1.79  ENDIF()