1.1 --- a/test/CMakeLists.txt	Mon Jan 19 11:42:15 2009 +0000
     1.2 +++ b/test/CMakeLists.txt	Tue Jan 20 12:23:14 2009 +0000
     1.3 @@ -1,4 +1,8 @@
     1.4 -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
     1.5 +INCLUDE_DIRECTORIES(
     1.6 +  ${CMAKE_SOURCE_DIR}
     1.7 +  ${CMAKE_BINARY_DIR}
     1.8 +  ${GLPK_INCLUDE_DIR}
     1.9 +)
    1.10  
    1.11  LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)
    1.12  
    1.13 @@ -11,26 +15,56 @@
    1.14    digraph_test
    1.15    dijkstra_test
    1.16    dim_test
    1.17 +  edge_set_test
    1.18    error_test
    1.19 -  edge_set_test
    1.20    graph_copy_test
    1.21    graph_test
    1.22    graph_utils_test
    1.23    hao_orlin_test
    1.24    heap_test
    1.25    kruskal_test
    1.26 -  lp_test
    1.27 -  mip_test
    1.28    maps_test
    1.29    max_matching_test
    1.30 -  radix_sort_test
    1.31    path_test
    1.32    preflow_test
    1.33 +  radix_sort_test
    1.34    random_test
    1.35    suurballe_test
    1.36    time_measure_test
    1.37    unionfind_test)
    1.38  
    1.39 +IF(HAVE_LP)
    1.40 +  ADD_EXECUTABLE(lp_test lp_test.cc)
    1.41 +  TARGET_LINK_LIBRARIES(lp_test lemon ${GLPK_LIBRARIES})
    1.42 +  ADD_TEST(lp_test lp_test)
    1.43 +
    1.44 +  IF(WIN32)
    1.45 +    GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
    1.46 +    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    1.47 +    ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
    1.48 +      COMMAND cmake -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH}
    1.49 +      COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}
    1.50 +      COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
    1.51 +    )
    1.52 +  ENDIF(WIN32)
    1.53 +ENDIF(HAVE_LP)
    1.54 +
    1.55 +IF(HAVE_MIP)
    1.56 +  ADD_EXECUTABLE(mip_test mip_test.cc)
    1.57 +  TARGET_LINK_LIBRARIES(mip_test lemon ${GLPK_LIBRARIES})
    1.58 +  ADD_TEST(mip_test mip_test)
    1.59 +
    1.60 +  IF(WIN32)
    1.61 +    GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
    1.62 +    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    1.63 +    ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
    1.64 +      COMMAND cmake -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH}
    1.65 +      COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}
    1.66 +      COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
    1.67 +    )
    1.68 +  ENDIF(WIN32)
    1.69 +ENDIF(HAVE_MIP)
    1.70 +
    1.71  FOREACH(TEST_NAME ${TESTS})
    1.72    ADD_EXECUTABLE(${TEST_NAME} ${TEST_NAME}.cc)
    1.73    TARGET_LINK_LIBRARIES(${TEST_NAME} lemon)