Ticket #446: 446-caf16813b1e8.patch
| File 446-caf16813b1e8.patch, 7.1 KB (added by , 11 years ago) |
|---|
-
CMakeLists.txt
# HG changeset patch # User Alpar Juttner <alpar@cs.elte.hu> # Date 1342858737 -7200 # Node ID caf16813b1e8c0f2f0bbd4b303442620b921834c # Parent b4f4c08e12104568afd3bcd60594dfc119e06ebf Better CPLEX discovery (#446) diff --git a/CMakeLists.txt b/CMakeLists.txt
a b 62 62 FIND_PACKAGE(Doxygen) 63 63 FIND_PACKAGE(Ghostscript) 64 64 FIND_PACKAGE(GLPK 4.33) 65 FIND_PACKAGE( CPLEX)65 FIND_PACKAGE(ILOG) 66 66 FIND_PACKAGE(COIN) 67 67 68 68 IF(DEFINED ENV{LEMON_CXX_WARNING}) -
INSTALL
diff --git a/INSTALL b/INSTALL
a b 108 108 109 109 -DGLPK_ROOT_DIR=DIRECTORY 110 110 -DCOIN_ROOT_DIR=DIRECTORY 111 -D CPLEX_ROOT_DIR=DIRECTORY111 -DILOG_ROOT_DIR=DIRECTORY 112 112 113 113 Install root directory prefixes of optional third party libraries. 114 114 -
cmake/FindGLPK.cmake
diff --git a/cmake/FindGLPK.cmake b/cmake/FindGLPK.cmake
a b 59 59 SET(LEMON_HAVE_MIP TRUE) 60 60 SET(LEMON_HAVE_GLPK TRUE) 61 61 ENDIF(GLPK_FOUND) 62 -
.cmake
diff --git a/cmake/FindCPLEX.cmake b/cmake/FindILOG.cmake rename from cmake/FindCPLEX.cmake rename to cmake/FindILOG.cmake
old new 1 SET(CPLEX_ROOT_DIR "" CACHE PATH "CPLEX root directory") 2 3 FIND_PATH(CPLEX_INCLUDE_DIR 4 ilcplex/cplex.h 5 PATHS "C:/ILOG/CPLEX/include" 6 PATHS "/opt/ilog/cplex/include" 7 HINTS ${CPLEX_ROOT_DIR}/include 8 ) 9 FIND_LIBRARY(CPLEX_LIBRARY 10 cplex 11 PATHS "C:/ILOG/CPLEX/lib/msvc7/stat_mda" 12 PATHS "/opt/ilog/cplex/bin" 13 HINTS ${CPLEX_ROOT_DIR}/bin 14 HINTS ${CPLEX_ROOT_DIR}/lib 1 FIND_PATH(ILOG_ROOT_DIR 2 NAMES cplex 3 DOC "CPLEX STUDIO root directory" 4 PATHS /opt/ibm/ILOG /usr/local/ibm/ILOG /usr/local/ILOG /usr/local/ilog 5 PATHS "$ENV{HOME}/ILOG" "$ENV{HOME}/.local/ILOG" 6 PATHS "$ENV{HOME}/ibm/ILOG" "$ENV{HOME}/.local/ibm/ILOG" 7 PATHS "C:/Program Files/IBM/ILOG" 8 PATH_SUFFIXES "CPLEX_Studio126" "CPLEX_Studio125" 9 "CPLEX_Studio124" "CPLEX_Studio123" "CPLEX_Studio122" 10 NO_DEFAULT_PATH 15 11 ) 16 12 17 INCLUDE(FindPackageHandleStandardArgs) 18 FIND_PACKAGE_HANDLE_STANDARD_ARGS(CPLEX DEFAULT_MSG CPLEX_LIBRARY CPLEX_INCLUDE_DIR) 13 IF(WIN32) 14 IF(MSVC_VERSION STREQUAL "1400") 15 SET(ILOG_WIN_COMPILER "windows_vs2005") 16 ELSEIF(MSVC_VERSION STREQUAL "1500") 17 SET(ILOG_WIN_COMPILER "windows_vs2008") 18 ELSEIF(MSVC_VERSION STREQUAL "1600") 19 SET(ILOG_WIN_COMPILER "windows_vs2010") 20 ELSE() 21 SET(ILOG_WIN_COMPILER "windows_vs2008") 22 ENDIF() 23 IF(CMAKE_CL_64) 24 SET(ILOG_WIN_COMPILER "x64_${ILOG_WIN_COMPILER}") 25 SET(ILOG_WIN_PLATFORM "x64_win32") 26 ELSE() 27 SET(ILOG_WIN_COMPILER "x86_${ILOG_WIN_COMPILER}") 28 SET(ILOG_WIN_PLATFORM "x86_win32") 29 ENDIF() 30 ENDIF() 19 31 20 FIND_PATH(CPLEX_BIN_DIR 21 cplex.dll 22 PATHS "C:/ILOG/CPLEX/bin/x86_win32" 23 HINTS ${CPLEX_ROOT_DIR}/bin 32 FIND_PATH(ILOG_CPLEX_ROOT_DIR 33 NAMES include/ilcplex 34 HINTS ${ILOG_ROOT_DIR}/cplex ${ILOG_ROOT_DIR}/cplex121 35 ${ILOG_ROOT_DIR}/cplex122 ${ILOG_ROOT_DIR}/cplex123 36 DOC "CPLEX root directory" 37 NO_DEFAULT_PATH 24 38 ) 25 39 26 IF(CPLEX_FOUND) 27 SET(CPLEX_INCLUDE_DIRS ${CPLEX_INCLUDE_DIR}) 28 SET(CPLEX_LIBRARIES ${CPLEX_LIBRARY}) 40 FIND_PATH(ILOG_CONCERT_ROOT_DIR 41 NAMES include/ilconcert 42 HINTS ${ILOG_ROOT_DIR}/concert ${ILOG_ROOT_DIR}/concert29 43 DOC "CONCERT root directory" 44 NO_DEFAULT_PATH 45 ) 46 47 FIND_PATH(ILOG_CPLEX_INCLUDE_DIR 48 ilcplex/cplex.h 49 HINTS ${ILOG_CPLEX_ROOT_DIR}/include 50 NO_DEFAULT_PATH 51 ) 52 53 FIND_PATH(ILOG_CONCERT_INCLUDE_DIR 54 ilconcert/ilobasic.h 55 HINTS ${ILOG_CONCERT_ROOT_DIR}/include 56 NO_DEFAULT_PATH 57 ) 58 59 FIND_LIBRARY(ILOG_CPLEX_LIBRARY 60 cplex cplex121 cplex122 cplex123 cplex124 61 HINTS ${ILOG_CPLEX_ROOT_DIR}/lib/x86_sles10_4.1/static_pic 62 ${ILOG_CPLEX_ROOT_DIR}/lib/x86-64_sles10_4.1/static_pic 63 ${ILOG_CPLEX_ROOT_DIR}/lib/x86_debian4.0_4.1/static_pic 64 ${ILOG_CPLEX_ROOT_DIR}/lib/x86-64_debian4.0_4.1/static_pic 65 ${ILOG_CPLEX_ROOT_DIR}/lib/${ILOG_WIN_COMPILER}/stat_mda 66 NO_DEFAULT_PATH 67 ) 68 69 FIND_LIBRARY(ILOG_CONCERT_LIBRARY 70 concert 71 HINTS ${ILOG_CONCERT_ROOT_DIR}/lib/x86_sles10_4.1/static_pic 72 ${ILOG_CONCERT_ROOT_DIR}/lib/x86-64_sles10_4.1/static_pic 73 ${ILOG_CONCERT_ROOT_DIR}/lib/x86_debian4.0_4.1/static_pic 74 ${ILOG_CONCERT_ROOT_DIR}/lib/x86-64_debian4.0_4.1/static_pic 75 ${ILOG_CONCERT_ROOT_DIR}/lib/${ILOG_WIN_COMPILER}/stat_mda 76 NO_DEFAULT_PATH 77 ) 78 79 FIND_FILE(ILOG_CPLEX_DLL 80 cplex121.dll cplex122.dll cplex123.dll cplex124.dll 81 HINTS ${ILOG_CPLEX_ROOT_DIR}/bin/${ILOG_WIN_PLATFORM} 82 NO_DEFAULT_PATH 83 ) 84 85 INCLUDE(FindPackageHandleStandardArgs) 86 FIND_PACKAGE_HANDLE_STANDARD_ARGS(ILOG 87 DEFAULT_MSG ILOG_CPLEX_LIBRARY ILOG_CPLEX_INCLUDE_DIR 88 ) 89 90 IF(ILOG_FOUND) 91 SET(ILOG_INCLUDE_DIRS ${ILOG_CPLEX_INCLUDE_DIR} ${ILOG_CONCERT_INCLUDE_DIR}) 92 SET(ILOG_LIBRARIES ${ILOG_CPLEX_LIBRARY} ${ILOG_CONCERT_LIBRARY}) 29 93 IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") 30 SET(CPLEX_LIBRARIES "${CPLEX_LIBRARIES};m;pthread") 94 # SET(CPLEX_LIBRARIES "${CPLEX_LIBRARIES};m;pthread") 95 SET(ILOG_LIBRARIES ${ILOG_LIBRARIES} "m" "pthread") 31 96 ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux") 32 ENDIF( CPLEX_FOUND)97 ENDIF(ILOG_FOUND) 33 98 34 MARK_AS_ADVANCED(CPLEX_LIBRARY CPLEX_INCLUDE_DIR CPLEX_BIN_DIR) 99 MARK_AS_ADVANCED( 100 ILOG_CPLEX_LIBRARY ILOG_CPLEX_INCLUDE_DIR ILOG_CPLEX_DLL 101 ILOG_CONCERT_LIBRARY ILOG_CONCERT_INCLUDE_DIR ILOG_CONCERT_DLL 102 ) 35 103 36 IF( CPLEX_FOUND)104 IF(ILOG_FOUND) 37 105 SET(LEMON_HAVE_LP TRUE) 38 106 SET(LEMON_HAVE_MIP TRUE) 39 107 SET(LEMON_HAVE_CPLEX TRUE) 40 ENDIF( CPLEX_FOUND)108 ENDIF(ILOG_FOUND) -
lemon/CMakeLists.txt
diff --git a/lemon/CMakeLists.txt b/lemon/CMakeLists.txt
a b 36 36 37 37 IF(LEMON_HAVE_CPLEX) 38 38 SET(LEMON_SOURCES ${LEMON_SOURCES} cplex.cc) 39 INCLUDE_DIRECTORIES(${ CPLEX_INCLUDE_DIRS})39 INCLUDE_DIRECTORIES(${ILOG_INCLUDE_DIRS}) 40 40 ENDIF() 41 41 42 42 IF(LEMON_HAVE_CLP) -
test/CMakeLists.txt
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
a b 66 66 SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES}) 67 67 ENDIF() 68 68 IF(LEMON_HAVE_CPLEX) 69 SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${ CPLEX_LIBRARIES})69 SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${ILOG_LIBRARIES}) 70 70 ENDIF() 71 71 IF(LEMON_HAVE_CLP) 72 72 SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${COIN_CLP_LIBRARIES}) … … 90 90 GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION) 91 91 GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) 92 92 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} 94 94 ) 95 95 ENDIF() 96 96 ENDIF() … … 108 108 SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${GLPK_LIBRARIES}) 109 109 ENDIF() 110 110 IF(LEMON_HAVE_CPLEX) 111 SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${ CPLEX_LIBRARIES})111 SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${ILOG_LIBRARIES}) 112 112 ENDIF() 113 113 IF(LEMON_HAVE_CBC) 114 114 SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${COIN_CBC_LIBRARIES}) … … 132 132 GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION) 133 133 GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) 134 134 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} 136 136 ) 137 137 ENDIF() 138 138 ENDIF()
