COIN-OR::LEMON - Graph Library

Changeset 1230:caf16813b1e8 in lemon for test


Ignore:
Timestamp:
07/21/12 10:18:57 (7 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Phase:
public
Message:

Better CPLEX discovery (#446)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • test/CMakeLists.txt

    r1162 r1230  
    6767  ENDIF()
    6868  IF(LEMON_HAVE_CPLEX)
    69     SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${CPLEX_LIBRARIES})
     69    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${ILOG_LIBRARIES})
    7070  ENDIF()
    7171  IF(LEMON_HAVE_CLP)
     
    9191    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    9292    ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
    93       COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH}
     93      COMMAND ${CMAKE_COMMAND} -E copy ${ILOG_CPLEX_DLL} ${TARGET_PATH}
    9494    )
    9595  ENDIF()
     
    109109  ENDIF()
    110110  IF(LEMON_HAVE_CPLEX)
    111     SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${CPLEX_LIBRARIES})
     111    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${ILOG_LIBRARIES})
    112112  ENDIF()
    113113  IF(LEMON_HAVE_CBC)
     
    133133    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    134134    ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
    135       COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH}
     135      COMMAND ${CMAKE_COMMAND} -E copy ${ILOG_CPLEX_DLL} ${TARGET_PATH}
    136136    )
    137137  ENDIF()
Note: See TracChangeset for help on using the changeset viewer.