COIN-OR::LEMON - Graph Library

Changeset 1119:1818cc848005 in lemon


Ignore:
Timestamp:
12/24/11 01:15:59 (8 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Phase:
public
Message:

Update CPLEX lookup

  • References to explicit CPLEX version 9.1 have been removed
  • Library file name must either be 'cplex.a' or 'cplex.dll'
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cmake/FindCPLEX.cmake

    r683 r1119  
    33FIND_PATH(CPLEX_INCLUDE_DIR
    44  ilcplex/cplex.h
    5   PATHS "C:/ILOG/CPLEX91/include"
    6   PATHS "/opt/ilog/cplex91/include"
     5  PATHS "C:/ILOG/CPLEX/include"
     6  PATHS "/opt/ilog/cplex/include"
    77  HINTS ${CPLEX_ROOT_DIR}/include
    88)
    99FIND_LIBRARY(CPLEX_LIBRARY
    10   cplex91
    11   PATHS "C:/ILOG/CPLEX91/lib/msvc7/stat_mda"
    12   PATHS "/opt/ilog/cplex91/bin"
     10  cplex
     11  PATHS "C:/ILOG/CPLEX/lib/msvc7/stat_mda"
     12  PATHS "/opt/ilog/cplex/bin"
    1313  HINTS ${CPLEX_ROOT_DIR}/bin
     14  HINTS ${CPLEX_ROOT_DIR}/lib
    1415)
    1516
     
    1819
    1920FIND_PATH(CPLEX_BIN_DIR
    20   cplex91.dll
    21   PATHS "C:/ILOG/CPLEX91/bin/x86_win32"
     21  cplex.dll
     22  PATHS "C:/ILOG/CPLEX/bin/x86_win32"
     23  HINTS ${CPLEX_ROOT_DIR}/bin
    2224)
    2325
  • test/CMakeLists.txt

    r1069 r1119  
    8383    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    8484    ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
    85       COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
     85      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH}
    8686    )
    8787  ENDIF()
     
    125125    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    126126    ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
    127       COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
     127      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH}
    128128    )
    129129  ENDIF()
Note: See TracChangeset for help on using the changeset viewer.