1.1 --- a/cmake/FindCOIN.cmake Fri Mar 23 15:43:30 2018 +0100
1.2 +++ b/cmake/FindCOIN.cmake Wed Oct 17 19:22:52 2018 +0200
1.3 @@ -65,6 +65,12 @@
1.4 HINTS ${COIN_ROOT_DIR}/lib
1.5 )
1.6
1.7 +FIND_LIBRARY(COIN_PTHREADS_LIBRARY
1.8 + NAMES pthreads libpthreads
1.9 + HINTS ${COIN_ROOT_DIR}/lib/coin
1.10 + HINTS ${COIN_ROOT_DIR}/lib
1.11 +)
1.12 +
1.13 INCLUDE(FindPackageHandleStandardArgs)
1.14 FIND_PACKAGE_HANDLE_STANDARD_ARGS(COIN DEFAULT_MSG
1.15 COIN_INCLUDE_DIR
1.16 @@ -82,14 +88,17 @@
1.17
1.18 IF(COIN_FOUND)
1.19 SET(COIN_INCLUDE_DIRS ${COIN_INCLUDE_DIR})
1.20 - SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY};${COIN_ZLIB_LIBRARY};${COIN_BZ2_LIBRARY}")
1.21 + SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY}")
1.22 IF(COIN_ZLIB_LIBRARY)
1.23 SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_ZLIB_LIBRARY}")
1.24 ENDIF(COIN_ZLIB_LIBRARY)
1.25 IF(COIN_BZ2_LIBRARY)
1.26 SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_BZ2_LIBRARY}")
1.27 ENDIF(COIN_BZ2_LIBRARY)
1.28 - 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}")
1.29 + IF(COIN_PTHREADS_LIBRARY)
1.30 + SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_PTHREADS_LIBRARY}")
1.31 + ENDIF(COIN_PTHREADS_LIBRARY)
1.32 + 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}")
1.33 SET(COIN_LIBRARIES ${COIN_CBC_LIBRARIES})
1.34 ENDIF(COIN_FOUND)
1.35