Skip to content

GitLab

Commit 69263e7f authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Updates to search for boost in environment BOOST_HOME. 

Disable use of multi-threaded boost.
parent 601d404d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
cmake/ThirdPartyBoost.cmake
View file @ 69263e7f
......@@ -85,12 +85,14 @@ IF (THIRDPARTY_BUILD_BOOST)
ENDIF ()
ELSE (THIRDPARTY_BUILD_BOOST)
SET(Boost_DEBUG 1)
SET(Boost_USE_MULTITHREAD ON)
SET(Boost_ADDITIONAL_VERSIONS "1.49" "1.49.0" "1.48" "1.48.0" "1.47.0" "1.47" "1.46" "1.46. 1" "1.40" "1.40.0" "1.35.0" "1.35")
SET(Boost_USE_MULTITHREADED OFF)
SET(Boost_ADDITIONAL_VERSIONS "1.51" "1.51.0" "1.50" "1.50.0" "1.49" "1.49.0" "1.48" "1.48.0" "1.47.0" "1.47" "1.46" "1.46. 1" "1.40" "1.40.0" "1.35.0" "1.35")
SET(Boost_NO_BOOST_CMAKE ON)
IF( NOT BOOST_ROOT )
#If the user has not set BOOST_ROOT, look in a couple common places first.
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)
......
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