Merge remote-tracking branch 'remotes/origin/master' into vb_admesh_fix
This commit is contained in:
commit
7dd842b294
11 changed files with 222 additions and 13 deletions
|
@ -241,7 +241,9 @@ if(NOT WIN32)
|
|||
endif()
|
||||
find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS system filesystem thread log locale regex)
|
||||
if(Boost_FOUND)
|
||||
# include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
|
||||
# message("Boost include dir: ${Boost_INCLUDE_DIRS}")
|
||||
# message("Boost library dirs: ${Boost_LIBRARY_DIRS}")
|
||||
# message("Boost libraries: ${Boost_LIBRARIES}")
|
||||
if (APPLE)
|
||||
# BOOST_ASIO_DISABLE_KQUEUE : prevents a Boost ASIO bug on OS X: https://svn.boost.org/trac/boost/ticket/5339
|
||||
add_definitions(-DBOOST_ASIO_DISABLE_KQUEUE)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue