equal
deleted
inserted
replaced
94 IF(ILOG_FOUND) |
94 IF(ILOG_FOUND) |
95 SET(ILOG_INCLUDE_DIRS ${ILOG_CPLEX_INCLUDE_DIR} ${ILOG_CONCERT_INCLUDE_DIR}) |
95 SET(ILOG_INCLUDE_DIRS ${ILOG_CPLEX_INCLUDE_DIR} ${ILOG_CONCERT_INCLUDE_DIR}) |
96 SET(ILOG_LIBRARIES ${ILOG_CPLEX_LIBRARY} ${ILOG_CONCERT_LIBRARY}) |
96 SET(ILOG_LIBRARIES ${ILOG_CPLEX_LIBRARY} ${ILOG_CONCERT_LIBRARY}) |
97 IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") |
97 IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") |
98 # SET(CPLEX_LIBRARIES "${CPLEX_LIBRARIES};m;pthread") |
98 # SET(CPLEX_LIBRARIES "${CPLEX_LIBRARIES};m;pthread") |
99 SET(ILOG_LIBRARIES ${ILOG_LIBRARIES} "m" "pthread") |
99 SET(ILOG_LIBRARIES ${ILOG_LIBRARIES} "m" "pthread" "dl") |
100 ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux") |
100 ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux") |
101 ENDIF(ILOG_FOUND) |
101 ENDIF(ILOG_FOUND) |
102 |
102 |
103 MARK_AS_ADVANCED( |
103 MARK_AS_ADVANCED( |
104 ILOG_CPLEX_LIBRARY ILOG_CPLEX_INCLUDE_DIR ILOG_CPLEX_DLL |
104 ILOG_CPLEX_LIBRARY ILOG_CPLEX_INCLUDE_DIR ILOG_CPLEX_DLL |