test/CMakeLists.txt
changeset 1065 490d89913a17
parent 1060 45befc97b1bc
parent 1062 caf16813b1e8
child 1088 4000b7ef4e01
     1.1 --- a/test/CMakeLists.txt	Thu Feb 28 23:45:39 2013 +0100
     1.2 +++ b/test/CMakeLists.txt	Mon Jul 15 08:33:08 2013 +0200
     1.3 @@ -69,7 +69,7 @@
     1.4      SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES})
     1.5    ENDIF()
     1.6    IF(LEMON_HAVE_CPLEX)
     1.7 -    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${CPLEX_LIBRARIES})
     1.8 +    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${ILOG_LIBRARIES})
     1.9    ENDIF()
    1.10    IF(LEMON_HAVE_CLP)
    1.11      SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${COIN_CLP_LIBRARIES})
    1.12 @@ -93,7 +93,7 @@
    1.13      GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
    1.14      GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    1.15      ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
    1.16 -      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH}
    1.17 +      COMMAND ${CMAKE_COMMAND} -E copy ${ILOG_CPLEX_DLL} ${TARGET_PATH}
    1.18      )
    1.19    ENDIF()
    1.20  ENDIF()
    1.21 @@ -111,7 +111,7 @@
    1.22      SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${GLPK_LIBRARIES})
    1.23    ENDIF()
    1.24    IF(LEMON_HAVE_CPLEX)
    1.25 -    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${CPLEX_LIBRARIES})
    1.26 +    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${ILOG_LIBRARIES})
    1.27    ENDIF()
    1.28    IF(LEMON_HAVE_CBC)
    1.29      SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${COIN_CBC_LIBRARIES})
    1.30 @@ -135,7 +135,7 @@
    1.31      GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
    1.32      GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    1.33      ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
    1.34 -      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH}
    1.35 +      COMMAND ${CMAKE_COMMAND} -E copy ${ILOG_CPLEX_DLL} ${TARGET_PATH}
    1.36      )
    1.37    ENDIF()
    1.38  ENDIF()