From a05daaf6332769de2dfd8a96c63b53362fcb23e3 Mon Sep 17 00:00:00 2001
From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Wed, 25 Oct 2017 17:48:47 +0200
Subject: [PATCH] Move check to configure_boost.cmake

---
 cmake/configure/configure_boost.cmake | 42 +++++++++++++++++++++++++
 cmake/modules/FindBOOST.cmake         | 45 ---------------------------
 2 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/cmake/configure/configure_boost.cmake b/cmake/configure/configure_boost.cmake
index 29ab0c1e5b..fc7bbde4eb 100644
--- a/cmake/configure/configure_boost.cmake
+++ b/cmake/configure/configure_boost.cmake
@@ -79,6 +79,48 @@ MACRO(FEATURE_BOOST_FIND_EXTERNAL var)
 
   IF(BOOST_FOUND)
     SET(${var} TRUE)
+
+    IF(DEAL_II_WITH_ZLIB)
+      #
+      # Test that Boost.Iostreams is usuable.
+      #
+      RESET_CMAKE_REQUIRED()
+      PUSH_CMAKE_REQUIRED("${DEAL_II_CXX_VERSION_FLAG}")
+      PUSH_CMAKE_REQUIRED("-L${Boost_LIBRARY_DIRS}")
+      SET(CMAKE_REQUIRED_LIBRARIES "-lboost_iostreams")
+      CHECK_CXX_SOURCE_COMPILES(
+        "
+        #include <string>
+        #include <boost/iostreams/device/back_inserter.hpp>
+        #include <boost/iostreams/filter/gzip.hpp>
+        #include <boost/iostreams/filtering_stream.hpp>
+
+        int main()
+        {
+          std::string decompressed_buffer;
+          char test[1] = {'c'};
+
+          boost::iostreams::filtering_ostream decompressing_stream;
+          decompressing_stream.push(boost::iostreams::gzip_decompressor());
+          decompressing_stream.push(boost::iostreams::back_inserter(decompressed_buffer));
+          decompressing_stream.write (test, 1);
+        }
+        "
+        _boost_iostreams_usuable
+        )
+      IF(${_boost_iostreams_usuable})
+        MESSAGE(STATUS "Boost.Iostreams is usuable.")
+      ELSE()
+        MESSAGE(STATUS
+                "DEAL_II_WITH_ZLIB=ON requires Boost.Iostreams to be compiled "
+                "with zlib support but a simple test failed! "
+                "Therefore, the bundled boost package is used."
+               )
+        SET(${var} FALSE)
+      ENDIF()
+      RESET_CMAKE_REQUIRED()
+    ENDIF()
+
   ENDIF()
 ENDMACRO()
 
diff --git a/cmake/modules/FindBOOST.cmake b/cmake/modules/FindBOOST.cmake
index 57c35234c9..5e1bec5e8d 100644
--- a/cmake/modules/FindBOOST.cmake
+++ b/cmake/modules/FindBOOST.cmake
@@ -78,51 +78,6 @@ IF(Boost_FOUND)
   SET(BOOST_VERSION
     "${BOOST_VERSION_MAJOR}.${BOOST_VERSION_MINOR}.${BOOST_VERSION_SUBMINOR}"
     )
-
-  IF(DEAL_II_WITH_ZLIB)
-    #
-    # Test that Boost.Iostreams is usuable.
-    #
-    RESET_CMAKE_REQUIRED()
-    PUSH_CMAKE_REQUIRED("${DEAL_II_CXX_VERSION_FLAG}")
-    PUSH_CMAKE_REQUIRED("-L${Boost_LIBRARY_DIRS}")
-    SET(CMAKE_REQUIRED_LIBRARIES "-lboost_iostreams")
-    CHECK_CXX_SOURCE_COMPILES(
-      "
-      #include <string>
-      #include <boost/iostreams/device/back_inserter.hpp>
-      #include <boost/iostreams/filter/gzip.hpp>
-      #include <boost/iostreams/filtering_stream.hpp>
-
-      int main()
-      {
-        std::string decompressed_buffer;
-        char test[1] = {'c'};
-
-        boost::iostreams::filtering_ostream decompressing_stream;
-        decompressing_stream.push(boost::iostreams::gzip_decompressor());
-        decompressing_stream.push(boost::iostreams::back_inserter(decompressed_buffer));
-        decompressing_stream.write (test, 1);
-      }
-      "
-      DEAL_II_BOOST_IOSTREAMS_USUABLE
-      )
-    MESSAGE(STATUS "${DEAL_II_BOOST_IOSTREAMS_USUABLE}")
-    IF(${DEAL_II_BOOST_IOSTREAMS_USUABLE})
-      MESSAGE(STATUS "Boost.Iostreams is usuable.")
-    ELSE()
-      MESSAGE(STATUS
-              "DEAL_II_WITH_ZLIB=ON requires Boost.Iostreams to be compiled "
-              "with zlib support but a simple test failed! "
-              "Therefore, the bundled boost package is used."
-             )
-      SET(Boost_FOUND FALSE)
-      SET(Boost_LIBRARIES "")
-      SET(Boost_INCLUDE_DIRS "")
-    ENDIF()
-    RESET_CMAKE_REQUIRED()
-  ENDIF()
-
 ENDIF()
 
 DEAL_II_PACKAGE_HANDLE(BOOST
-- 
2.39.5