diff --git a/cmake/FindCPLEX.cmake b/cmake/FindCPLEX.cmake --- a/cmake/FindCPLEX.cmake +++ b/cmake/FindCPLEX.cmake @@ -2,23 +2,25 @@ FIND_PATH(CPLEX_INCLUDE_DIR ilcplex/cplex.h - PATHS "C:/ILOG/CPLEX91/include" - PATHS "/opt/ilog/cplex91/include" + PATHS "C:/ILOG/CPLEX/include" + PATHS "/opt/ilog/cplex/include" HINTS ${CPLEX_ROOT_DIR}/include ) FIND_LIBRARY(CPLEX_LIBRARY - cplex91 - PATHS "C:/ILOG/CPLEX91/lib/msvc7/stat_mda" - PATHS "/opt/ilog/cplex91/bin" + cplex + PATHS "C:/ILOG/CPLEX/lib/msvc7/stat_mda" + PATHS "/opt/ilog/cplex/bin" HINTS ${CPLEX_ROOT_DIR}/bin + HINTS ${CPLEX_ROOT_DIR}/lib ) INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(CPLEX DEFAULT_MSG CPLEX_LIBRARY CPLEX_INCLUDE_DIR) FIND_PATH(CPLEX_BIN_DIR - cplex91.dll - PATHS "C:/ILOG/CPLEX91/bin/x86_win32" + cplex.dll + PATHS "C:/ILOG/CPLEX/bin/x86_win32" + HINTS ${CPLEX_ROOT_DIR}/bin ) IF(CPLEX_FOUND) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -82,7 +82,7 @@ GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION) GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH} + COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH} ) ENDIF() ENDIF() @@ -124,7 +124,7 @@ GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION) GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH} + COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH} ) ENDIF() ENDIF()