From: Matthias Maier <tamiko@43-1.org>
Date: Wed, 25 Jul 2018 12:42:25 +0000 (-0500)
Subject: CMake: Do not check for the geometry component in FindBOOST.cmake
X-Git-Tag: v9.1.0-rc1~889^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F6973%2Fhead;p=dealii.git

CMake: Do not check for the geometry component in FindBOOST.cmake

Boost.Geometry is a header-only component of Boost. It is
unconditionally installed.

CMake does not support to configure with the "geometry" component
because it cannot pick up a corresponding library (is true at least for
versions 3.9, 3.10, 3.11, 3.12).

Thus, remove the geometry component from the find(Boost ...) call.

Closes #6969
---

diff --git a/cmake/modules/FindBOOST.cmake b/cmake/modules/FindBOOST.cmake
index 0f1ba9e280..423dcd047e 100644
--- a/cmake/modules/FindBOOST.cmake
+++ b/cmake/modules/FindBOOST.cmake
@@ -52,11 +52,11 @@ ENDIF()
 LIST(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/)
 IF(DEAL_II_WITH_ZLIB)
   FIND_PACKAGE(Boost ${BOOST_VERSION_REQUIRED} COMPONENTS
-    iostreams serialization system thread geometry
+    iostreams serialization system thread
     )
 ELSE()
   FIND_PACKAGE(Boost ${BOOST_VERSION_REQUIRED} COMPONENTS
-    serialization system thread geometry
+    serialization system thread
     )
 ENDIF()
 LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/)
@@ -70,9 +70,9 @@ IF(NOT Boost_FOUND AND Boost_USE_STATIC_LIBS)
   # temporarily disable ${CMAKE_SOURCE_DIR}/cmake/modules for module lookup
   LIST(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/)
   IF(DEAL_II_WITH_ZLIB)
-    FIND_PACKAGE(Boost ${BOOST_VERSION_REQUIRED} COMPONENTS iostreams serialization system thread geometry)
+    FIND_PACKAGE(Boost ${BOOST_VERSION_REQUIRED} COMPONENTS iostreams serialization system thread)
   ELSE()
-    FIND_PACKAGE(Boost ${BOOST_VERSION_REQUIRED} COMPONENTS serialization system thread geometry)
+    FIND_PACKAGE(Boost ${BOOST_VERSION_REQUIRED} COMPONENTS serialization system thread)
   ENDIF()
   LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/)
 ENDIF()
@@ -104,7 +104,6 @@ DEAL_II_PACKAGE_HANDLE(BOOST
     Boost_SERIALIZATION_LIBRARY_DEBUG Boost_SERIALIZATION_LIBRARY_RELEASE
     Boost_SYSTEM_LIBRARY_DEBUG Boost_SYSTEM_LIBRARY_RELEASE
     Boost_THREAD_LIBRARY_DEBUG Boost_THREAD_LIBRARY_RELEASE
-    Boost_GEOMETRY_LIBRARY_DEBUG Boost_GEOMETRY_LIBRARY_RELEASE
     Boost_LIBRARY_DIR_DEBUG Boost_LIBRARY_DIR_RELEASE
     _Boost_COMPONENTS_SEARCHED _Boost_INCLUDE_DIR_LAST
     _Boost_LIBRARY_DIR_LAST _Boost_USE_MULTITHREADED_LAST