r1122:0976225b5cae
Wed, 11 Jan 2012 14:01:21
[Not Reviewed]
0 comments (0 inline)
0
4
0
| ... | ... |
@@ -56,2 +56,13 @@ |
| 56 | 56 |
|
| 57 |
FIND_LIBRARY(COIN_ZLIB_LIBRARY |
|
| 58 |
NAMES z libz |
|
| 59 |
HINTS ${COIN_ROOT_DIR}/lib/coin
|
|
| 60 |
HINTS ${COIN_ROOT_DIR}/lib
|
|
| 61 |
) |
|
| 62 |
FIND_LIBRARY(COIN_BZ2_LIBRARY |
|
| 63 |
NAMES bz2 libbz2 |
|
| 64 |
HINTS ${COIN_ROOT_DIR}/lib/coin
|
|
| 65 |
HINTS ${COIN_ROOT_DIR}/lib
|
|
| 66 |
) |
|
| 67 |
|
|
| 57 | 68 |
INCLUDE(FindPackageHandleStandardArgs) |
| ... | ... |
@@ -73,5 +84,11 @@ |
| 73 | 84 |
SET(COIN_INCLUDE_DIRS ${COIN_INCLUDE_DIR})
|
| 74 |
SET(COIN_LIBRARIES "${COIN_CBC_LIBRARY};${COIN_CBC_SOLVER_LIBRARY};${COIN_CGL_LIBRARY};${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY};${COIN_OSI_LIBRARY};${COIN_OSI_CBC_LIBRARY};${COIN_OSI_CLP_LIBRARY}")
|
|
| 75 |
SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY}")
|
|
| 76 |
SET( |
|
| 85 |
SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY};${COIN_ZLIB_LIBRARY};${COIN_BZ2_LIBRARY}")
|
|
| 86 |
IF(COIN_ZLIB_LIBRARY) |
|
| 87 |
SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_ZLIB_LIBRARY}")
|
|
| 88 |
ENDIF(COIN_ZLIB_LIBRARY) |
|
| 89 |
IF(COIN_BZ2_LIBRARY) |
|
| 90 |
SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_BZ2_LIBRARY}")
|
|
| 91 |
ENDIF(COIN_BZ2_LIBRARY) |
|
| 92 |
SET(COIN_CBC_LIBRARIES "${COIN_CBC_LIBRARY};${COIN_CBC_SOLVER_LIBRARY};${COIN_CGL_LIBRARY};${COIN_OSI_LIBRARY};${COIN_OSI_CBC_LIBRARY};${COIN_OSI_CLP_LIBRARY};${COIN_ZLIB_LIBRARY};${COIN_BZ2_LIBRARY};${COIN_CLP_LIBRARIES}")
|
|
| 93 |
SET(COIN_LIBRARIES ${COIN_CBC_LIBRARIES})
|
|
| 77 | 94 |
ENDIF(COIN_FOUND) |
| ... | ... |
@@ -90,2 +107,4 @@ |
| 90 | 107 |
COIN_VOL_LIBRARY |
| 108 |
COIN_ZLIB_LIBRARY |
|
| 109 |
COIN_BZ2_LIBRARY |
|
| 91 | 110 |
) |
| ... | ... |
@@ -4,4 +4,4 @@ |
| 4 | 4 |
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" |
|
| 7 | 7 |
HINTS ${CPLEX_ROOT_DIR}/include
|
| ... | ... |
@@ -9,6 +9,7 @@ |
| 9 | 9 |
FIND_LIBRARY(CPLEX_LIBRARY |
| 10 |
cplex91 |
|
| 11 |
PATHS "C:/ILOG/CPLEX91/lib/msvc7/stat_mda" |
|
| 12 |
|
|
| 10 |
cplex |
|
| 11 |
PATHS "C:/ILOG/CPLEX/lib/msvc7/stat_mda" |
|
| 12 |
PATHS "/opt/ilog/cplex/bin" |
|
| 13 | 13 |
HINTS ${CPLEX_ROOT_DIR}/bin
|
| 14 |
HINTS ${CPLEX_ROOT_DIR}/lib
|
|
| 14 | 15 |
) |
| ... | ... |
@@ -19,4 +20,5 @@ |
| 19 | 20 |
FIND_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
|
|
| 22 | 24 |
) |
| ... | ... |
@@ -27,8 +27,3 @@ |
| 27 | 27 |
|
| 28 |
#ifdef COIN_HAS_CLP |
|
| 29 | 28 |
#include "coin/OsiClpSolverInterface.hpp" |
| 30 |
#endif |
|
| 31 |
#ifdef COIN_HAS_OSL |
|
| 32 |
#include "coin/OsiOslSolverInterface.hpp" |
|
| 33 |
#endif |
|
| 34 | 29 |
|
| ... | ... |
@@ -272,9 +267,3 @@ |
| 272 | 267 |
} |
| 273 |
#ifdef COIN_HAS_CLP |
|
| 274 | 268 |
_osi_solver = new OsiClpSolverInterface(); |
| 275 |
#elif COIN_HAS_OSL |
|
| 276 |
_osi_solver = new OsiOslSolverInterface(); |
|
| 277 |
#else |
|
| 278 |
#error Cannot instantiate Osi solver |
|
| 279 |
#endif |
|
| 280 | 269 |
|
| ... | ... |
@@ -330,3 +319,2 @@ |
| 330 | 319 |
|
| 331 |
#ifdef COIN_HAS_CLP |
|
| 332 | 320 |
OsiClpSolverInterface* osiclp = |
| ... | ... |
@@ -336,3 +324,2 @@ |
| 336 | 324 |
} |
| 337 |
#endif |
|
| 338 | 325 |
| ... | ... |
@@ -88,3 +88,3 @@ |
| 88 | 88 |
ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD |
| 89 |
COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/
|
|
| 89 |
COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH}
|
|
| 90 | 90 |
) |
| ... | ... |
@@ -130,3 +130,3 @@ |
| 130 | 130 |
ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD |
| 131 |
COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/
|
|
| 131 |
COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH}
|
|
| 132 | 132 |
) |
0 comments (0 inline)