move check to configure_boost

diff --git a/cmake/configure/configure_boost.cmake b/cmake/configure/configure_boost.cmake
index d91c87a91b537e436422b5918191625640380049..cc6dc845c89a2471609dabc5cecad98c8520870c 100644 (file)
--- a/cmake/configure/configure_boost.cmake
+++ b/cmake/configure/configure_boost.cmake
@@ -47,6 +47,22 @@ MACRO(FEATURE_BOOST_CONFIGURE_BUNDLED)
   ENDIF()
 ENDMACRO()
 
+MACRO(FEATURE_BOOST_FIND_EXTERNAL var)
+  FIND_PACKAGE(BOOST)
+
+  IF(BOOST_FOUND)
+    SET(${var} TRUE)
+
+    #
+    # Blacklist version 1.58 because we get serialization errors with it. At
+    # least version 1.56 and 1.59 are known to work.
+    #
+    IF("${Boost_MAJOR_VERSION}" STREQUAL "1" AND "${Boost_MINOR_VERSION}" STREQUAL "58")
+      MESSAGE(STATUS "Boost version 1.58 is not compatible with deal.II!")
+      SET(${var} FALSE)
+    ENDIF()
+  ENDIF()
+ENDMACRO()
 
 MACRO(FEATURE_BOOST_CONFIGURE_EXTERNAL)
   ENABLE_IF_SUPPORTED(BOOST_CXX_FLAGS "-Wno-unused-local-typedefs")

diff --git a/cmake/modules/FindBOOST.cmake b/cmake/modules/FindBOOST.cmake
index cd90be22cac893aab9e09325e975aeaa41fc4f14..dc4c0e3063929c9968c44317db10e8c0b8871c4f 100644 (file)
--- a/cmake/modules/FindBOOST.cmake
+++ b/cmake/modules/FindBOOST.cmake
@@ -59,19 +59,6 @@ IF(NOT Boost_FOUND AND Boost_USE_STATIC_LIBS)
 ENDIF()
 
 
-#
-# Blacklist version 1.58 because we get serialization errors with it. At least
-# version 1.56 and 1.59 are known to work.
-#
-IF(Boost_FOUND)
-  IF("${Boost_MAJOR_VERSION}" STREQUAL "1" AND "${Boost_MINOR_VERSION}" STREQUAL "58")
-    MESSAGE("-- Boost version 1.58 is not compatible with deal.II!")
-    UNSET(Boost_FOUND)
-    UNSET(Boost_INCLUDE_DIRS)
-    UNSET(Boost_LIBRARIES)
-  ENDIF()
-ENDIF()
-
 
 IF(Boost_FOUND)
   #