1.1 --- a/test/CMakeLists.txt	Thu Apr 23 07:28:56 2009 +0100
     1.2 +++ b/test/CMakeLists.txt	Thu Apr 23 07:29:50 2009 +0100
     1.3 @@ -38,9 +38,14 @@
     1.4  
     1.5  IF(HAVE_LP)
     1.6    ADD_EXECUTABLE(lp_test lp_test.cc)
     1.7 +  SET(LP_TEST_LIBS lemon)
     1.8    IF(HAVE_GLPK)
     1.9 -    TARGET_LINK_LIBRARIES(lp_test lemon ${GLPK_LIBRARIES})
    1.10 +    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES})
    1.11    ENDIF(HAVE_GLPK)
    1.12 +  IF(HAVE_CPLEX)
    1.13 +    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${CPLEX_LIBRARIES})
    1.14 +  ENDIF(HAVE_CPLEX)
    1.15 +  TARGET_LINK_LIBRARIES(lp_test ${LP_TEST_LIBS})
    1.16    ADD_TEST(lp_test lp_test)
    1.17  
    1.18    IF(WIN32 AND HAVE_GLPK)
    1.19 @@ -52,13 +57,25 @@
    1.20        COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
    1.21      )
    1.22    ENDIF(WIN32 AND HAVE_GLPK)
    1.23 +  IF(WIN32 AND HAVE_CPLEX)
    1.24 +    GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
    1.25 +    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    1.26 +    ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
    1.27 +      COMMAND cmake -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
    1.28 +    )
    1.29 +  ENDIF(WIN32 AND HAVE_CPLEX)
    1.30  ENDIF(HAVE_LP)
    1.31  
    1.32  IF(HAVE_MIP)
    1.33    ADD_EXECUTABLE(mip_test mip_test.cc)
    1.34 +  SET(MIP_TEST_LIBS lemon)
    1.35    IF(HAVE_GLPK)
    1.36 -    TARGET_LINK_LIBRARIES(mip_test lemon ${GLPK_LIBRARIES})
    1.37 +    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${GLPK_LIBRARIES})
    1.38    ENDIF(HAVE_GLPK)
    1.39 +  IF(HAVE_CPLEX)
    1.40 +    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${CPLEX_LIBRARIES})
    1.41 +  ENDIF(HAVE_CPLEX)
    1.42 +  TARGET_LINK_LIBRARIES(mip_test ${MIP_TEST_LIBS})
    1.43    ADD_TEST(mip_test mip_test)
    1.44  
    1.45    IF(WIN32 AND HAVE_GLPK)
    1.46 @@ -70,6 +87,13 @@
    1.47        COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
    1.48      )
    1.49    ENDIF(WIN32 AND HAVE_GLPK)
    1.50 +  IF(WIN32 AND HAVE_CPLEX)
    1.51 +    GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
    1.52 +    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    1.53 +    ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
    1.54 +      COMMAND cmake -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
    1.55 +    )
    1.56 +  ENDIF(WIN32 AND HAVE_CPLEX)
    1.57  ENDIF(HAVE_MIP)
    1.58  
    1.59  FOREACH(TEST_NAME ${TESTS})