]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Check if external boost library contains geometry.
authorLuca Heltai <luca.heltai@sissa.it>
Sun, 22 Jul 2018 15:16:05 +0000 (17:16 +0200)
committerLuca Heltai <luca.heltai@sissa.it>
Mon, 23 Jul 2018 07:29:48 +0000 (09:29 +0200)
cmake/modules/FindBOOST.cmake

index 423dcd047ee81d12e1a4ebbde9cb96b9a7708258..0f1ba9e280c006766fe08a75dfff794fa1538e8d 100644 (file)
@@ -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
+    iostreams serialization system thread geometry
     )
 ELSE()
   FIND_PACKAGE(Boost ${BOOST_VERSION_REQUIRED} COMPONENTS
-    serialization system thread
+    serialization system thread geometry
     )
 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)
+    FIND_PACKAGE(Boost ${BOOST_VERSION_REQUIRED} COMPONENTS iostreams serialization system thread geometry)
   ELSE()
-    FIND_PACKAGE(Boost ${BOOST_VERSION_REQUIRED} COMPONENTS serialization system thread)
+    FIND_PACKAGE(Boost ${BOOST_VERSION_REQUIRED} COMPONENTS serialization system thread geometry)
   ENDIF()
   LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/)
 ENDIF()
@@ -104,6 +104,7 @@ 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

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.