equal
deleted
inserted
replaced
63 NAMES bz2 libbz2 |
63 NAMES bz2 libbz2 |
64 HINTS ${COIN_ROOT_DIR}/lib/coin |
64 HINTS ${COIN_ROOT_DIR}/lib/coin |
65 HINTS ${COIN_ROOT_DIR}/lib |
65 HINTS ${COIN_ROOT_DIR}/lib |
66 ) |
66 ) |
67 |
67 |
|
68 FIND_LIBRARY(COIN_PTHREADS_LIBRARY |
|
69 NAMES pthreads libpthreads |
|
70 HINTS ${COIN_ROOT_DIR}/lib/coin |
|
71 HINTS ${COIN_ROOT_DIR}/lib |
|
72 ) |
|
73 |
68 INCLUDE(FindPackageHandleStandardArgs) |
74 INCLUDE(FindPackageHandleStandardArgs) |
69 FIND_PACKAGE_HANDLE_STANDARD_ARGS(COIN DEFAULT_MSG |
75 FIND_PACKAGE_HANDLE_STANDARD_ARGS(COIN DEFAULT_MSG |
70 COIN_INCLUDE_DIR |
76 COIN_INCLUDE_DIR |
71 COIN_CBC_LIBRARY |
77 COIN_CBC_LIBRARY |
72 COIN_CBC_SOLVER_LIBRARY |
78 COIN_CBC_SOLVER_LIBRARY |
80 # COIN_VOL_LIBRARY |
86 # COIN_VOL_LIBRARY |
81 ) |
87 ) |
82 |
88 |
83 IF(COIN_FOUND) |
89 IF(COIN_FOUND) |
84 SET(COIN_INCLUDE_DIRS ${COIN_INCLUDE_DIR}) |
90 SET(COIN_INCLUDE_DIRS ${COIN_INCLUDE_DIR}) |
85 SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY};${COIN_ZLIB_LIBRARY};${COIN_BZ2_LIBRARY}") |
91 SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY}") |
86 IF(COIN_ZLIB_LIBRARY) |
92 IF(COIN_ZLIB_LIBRARY) |
87 SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_ZLIB_LIBRARY}") |
93 SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_ZLIB_LIBRARY}") |
88 ENDIF(COIN_ZLIB_LIBRARY) |
94 ENDIF(COIN_ZLIB_LIBRARY) |
89 IF(COIN_BZ2_LIBRARY) |
95 IF(COIN_BZ2_LIBRARY) |
90 SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_BZ2_LIBRARY}") |
96 SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_BZ2_LIBRARY}") |
91 ENDIF(COIN_BZ2_LIBRARY) |
97 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}") |
98 IF(COIN_PTHREADS_LIBRARY) |
|
99 SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_PTHREADS_LIBRARY}") |
|
100 ENDIF(COIN_PTHREADS_LIBRARY) |
|
101 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_CLP_LIBRARIES}") |
93 SET(COIN_LIBRARIES ${COIN_CBC_LIBRARIES}) |
102 SET(COIN_LIBRARIES ${COIN_CBC_LIBRARIES}) |
94 ENDIF(COIN_FOUND) |
103 ENDIF(COIN_FOUND) |
95 |
104 |
96 MARK_AS_ADVANCED( |
105 MARK_AS_ADVANCED( |
97 COIN_INCLUDE_DIR |
106 COIN_INCLUDE_DIR |