Commit 3ee446df authored by Chris Cantwell's avatar Chris Cantwell

Fixed Boost library detection to allow selection of non-mt or -mt variants.

parent 45230e01
SET(THIRDPARTY_BUILD_BOOST OFF CACHE BOOL
"Build Boost libraries")
SET(Boost_USE_MULTITHREADED ON CACHE BOOL
"Search for multithreaded boost libraries")
MARK_AS_ADVANCED(Boost_USE_MULTITHREADED)
IF (THIRDPARTY_BUILD_BOOST)
INCLUDE(ExternalProject)
......@@ -99,18 +102,6 @@ ELSE (THIRDPARTY_BUILD_BOOST)
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/ThirdParty/dist)
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
# In case we have not found the threaded version, look for the
# non-threaded version of the libraries.
SET(Boost_USE_MULTITHREADED OFF)
SET(BOOST_ROOT $ENV{BOOST_HOME})
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/ThirdParty/boost)
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/../ThirdParty/boost)
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/ThirdParty/dist)
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
ELSE()
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
ENDIF()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment