Commit c41fcbc3 authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Enforced minimum version of Boost in cmake. Updated user guide.

parent de267a40
...@@ -8,27 +8,28 @@ ...@@ -8,27 +8,28 @@
#If the user has not set BOOST_ROOT, look in a couple common places first. #If the user has not set BOOST_ROOT, look in a couple common places first.
MESSAGE(STATUS "Searching for Boost:") MESSAGE(STATUS "Searching for Boost:")
SET(MIN_VER "1.52.0")
SET(NEEDED_BOOST_LIBS thread iostreams date_time filesystem system SET(NEEDED_BOOST_LIBS thread iostreams date_time filesystem system
program_options regex timer) program_options regex timer)
SET(Boost_DEBUG 0) SET(Boost_DEBUG 0)
SET(Boost_NO_BOOST_CMAKE ON) SET(Boost_NO_BOOST_CMAKE ON)
IF( BOOST_ROOT ) IF( BOOST_ROOT )
SET(Boost_NO_SYSTEM_PATHS ON) SET(Boost_NO_SYSTEM_PATHS ON)
FIND_PACKAGE( Boost COMPONENTS ${NEEDED_BOOST_LIBS}) FIND_PACKAGE( Boost ${MIN_VER} COMPONENTS ${NEEDED_BOOST_LIBS})
ELSE () ELSE ()
SET(TEST_ENV1 $ENV{BOOST_HOME}) SET(TEST_ENV1 $ENV{BOOST_HOME})
SET(TEST_ENV2 $ENV{BOOST_DIR}) SET(TEST_ENV2 $ENV{BOOST_DIR})
IF (DEFINED TEST_ENV1) IF (DEFINED TEST_ENV1)
SET(BOOST_ROOT $ENV{BOOST_HOME}) SET(BOOST_ROOT $ENV{BOOST_HOME})
SET(Boost_NO_SYSTEM_PATHS ON) SET(Boost_NO_SYSTEM_PATHS ON)
FIND_PACKAGE( Boost QUIET COMPONENTS ${NEEDED_BOOST_LIBS} ) FIND_PACKAGE( Boost ${MIN_VER} QUIET COMPONENTS ${NEEDED_BOOST_LIBS} )
ELSEIF (DEFINED TEST_ENV2) ELSEIF (DEFINED TEST_ENV2)
SET(BOOST_ROOT $ENV{BOOST_DIR}) SET(BOOST_ROOT $ENV{BOOST_DIR})
SET(Boost_NO_SYSTEM_PATHS ON) SET(Boost_NO_SYSTEM_PATHS ON)
FIND_PACKAGE( Boost QUIET COMPONENTS ${NEEDED_BOOST_LIBS} ) FIND_PACKAGE( Boost ${MIN_VER} QUIET COMPONENTS ${NEEDED_BOOST_LIBS} )
ELSE () ELSE ()
SET(BOOST_ROOT ${TPDIST}) SET(BOOST_ROOT ${TPDIST})
FIND_PACKAGE( Boost QUIET COMPONENTS ${NEEDED_BOOST_LIBS} ) FIND_PACKAGE( Boost ${MIN_VER} QUIET COMPONENTS ${NEEDED_BOOST_LIBS} )
ENDIF() ENDIF()
ENDIF() ENDIF()
......
...@@ -62,7 +62,7 @@ BLAS & \cmark & \cmark & \cmark & & Or MKL, ...@@ -62,7 +62,7 @@ BLAS & \cmark & \cmark & \cmark & & Or MKL,
ACML, OpenBLAS ACML, OpenBLAS
\\ \\
LAPACK & \cmark & \cmark & \cmark & & \\ LAPACK & \cmark & \cmark & \cmark & & \\
Boost $>1.49$ & \cmark & \cmark & \cmark & \cmark & Compile Boost $>=1.52$ & \cmark & \cmark & \cmark & \cmark & Compile
with iostreams with iostreams
\\ \\
ModMETIS & \cmark & & & \cmark & \\ ModMETIS & \cmark & & & \cmark & \\
...@@ -218,7 +218,7 @@ BLAS & \cmark & & & & Part of ...@@ -218,7 +218,7 @@ BLAS & \cmark & & & & Part of
Xcode \\ Xcode \\
LAPACK & \cmark & & & & Part of LAPACK & \cmark & & & & Part of
Xcode \\ Xcode \\
Boost $>1.49$ & \cmark & \texttt{boost} & \cmark & \cmark & Compile Boost $>=1.52$ & \cmark & \texttt{boost} & \cmark & \cmark & Compile
with iostreams \\ with iostreams \\
TinyXML & \cmark & \texttt{tinyxml} & \cmark & \cmark & \\ TinyXML & \cmark & \texttt{tinyxml} & \cmark & \cmark & \\
ModMETIS & \cmark & & & \cmark & \\ ModMETIS & \cmark & & & \cmark & \\
......
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