From: maier Date: Fri, 16 Aug 2013 22:17:18 +0000 (+0000) Subject: CMake: Fix Boost versin numbers and BOOST_DIR X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9d1b59d30549878dea6a36f49a53fc5293dcef2;p=dealii-svn.git CMake: Fix Boost versin numbers and BOOST_DIR git-svn-id: https://svn.dealii.org/trunk@30323 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/configure/configure_boost.cmake b/deal.II/cmake/configure/configure_boost.cmake index 7d017236b4..91824606ad 100644 --- a/deal.II/cmake/configure/configure_boost.cmake +++ b/deal.II/cmake/configure/configure_boost.cmake @@ -38,6 +38,11 @@ SET(DEAL_II_WITH_BOOST ON # Always true. We need it :-] MACRO(FEATURE_BOOST_FIND_EXTERNAL var) + SET_IF_EMPTY(BOOST_DIR "$ENV{BOOST_DIR}") + IF(NOT "${BOOST_DIR}" STREQUAL "") + SET(Boost_DIR "${BOOST_DIR}") + ENDIF() + IF(DEAL_II_WITH_THREADS) SET(_boost_components serialization system thread) ELSE() @@ -65,6 +70,14 @@ MACRO(FEATURE_BOOST_FIND_EXTERNAL var) MARK_AS_ADVANCED(Boost_DIR) + SET(BOOST_VERSION_MAJOR "${Boost_MAJOR_VERSION}") + SET(BOOST_VERSION_MINOR "${Boost_MINOR_VERSION}") + SET(BOOST_VERSION_SUBMINOR "${Boost_SUBMINOR_VERSION}") + SET(BOOST_VERSION + "${BOOST_VERSION_MAJOR}.${BOOST_VERSION_MINOR}.${BOOST_VERSION_SUBMINOR}" + ) + + IF( Boost_SERIALIZATION_FOUND AND Boost_SYSTEM_FOUND AND (NOT DEAL_II_WITH_THREADS OR Boost_THREAD_FOUND) diff --git a/deal.II/doc/development/cmake.html b/deal.II/doc/development/cmake.html index 40cf64aed2..8139fdc110 100644 --- a/deal.II/doc/development/cmake.html +++ b/deal.II/doc/development/cmake.html @@ -380,6 +380,7 @@
 
     ARPACK_DIR,
+    BOOST_DIR,
     HDF5_DIR,
     LAPACK_DIR (and BLAS_DIR),
     METIS_DIR,