From 05a1833d2826c349ad97a59a6bd0761b431f6200 Mon Sep 17 00:00:00 2001 From: Luca Heltai Date: Sun, 22 Jul 2018 17:16:05 +0200 Subject: [PATCH] Check if external boost library contains geometry. --- cmake/modules/FindBOOST.cmake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake/modules/FindBOOST.cmake b/cmake/modules/FindBOOST.cmake index 423dcd047e..0f1ba9e280 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 + 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 -- 2.39.5