]> https://gitweb.dealii.org/ - dealii.git/commitdiff
CMake: Fix Boost versin numbers and BOOST_DIR
authorMatthias Maier <tamiko@kyomu.43-1.org>
Fri, 16 Aug 2013 22:17:18 +0000 (22:17 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Fri, 16 Aug 2013 22:17:18 +0000 (22:17 +0000)
git-svn-id: https://svn.dealii.org/trunk@30323 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/configure/configure_boost.cmake
deal.II/doc/development/cmake.html

index 7d017236b4c2bb19bbdb995eb32923e7e4fbafa3..91824606adb1bcaeef09af51c3cbc5a39b772e4c 100644 (file)
@@ -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)
index 40cf64aed2b71c5449a289523defbd19821ed6be..8139fdc11090a2a07426a1dc1314f99f3fc441b2 100644 (file)
            <pre>
 
     ARPACK_DIR,
+    BOOST_DIR,
     HDF5_DIR,
     LAPACK_DIR (and BLAS_DIR),
     METIS_DIR,

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.