From 2ba1cd6dabb9cc535a33a1bf991dd31ede1aca11 Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 8 Mar 2013 23:05:21 +0000 Subject: [PATCH] CMake: Fix underlinkage with external boost-1.52 [1] [1] https://svn.boost.org/trac/boost/ticket/7241 git-svn-id: https://svn.dealii.org/trunk@28827 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/configure/configure_boost.cmake | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/deal.II/cmake/configure/configure_boost.cmake b/deal.II/cmake/configure/configure_boost.cmake index b3548d23b4..b5cbc1e6ae 100644 --- a/deal.II/cmake/configure/configure_boost.cmake +++ b/deal.II/cmake/configure/configure_boost.cmake @@ -38,9 +38,11 @@ MACRO(FEATURE_BOOST_FIND_EXTERNAL var) # # We require at least version 1.44 # - FIND_PACKAGE(Boost 1.44 COMPONENTS serialization thread) + FIND_PACKAGE(Boost 1.44 COMPONENTS serialization system thread) - IF(Boost_THREAD_FOUND AND Boost_SERIALIZATION_FOUND) + IF(Boost_THREAD_FOUND AND + Boost_SERIALIZATION_FOUND AND + Boost_SYSTEM_FOUND) SET(${var} TRUE) # Get rid of this annoying unimportant variable: @@ -54,13 +56,17 @@ MACRO(FEATURE_BOOST_CONFIGURE_EXTERNAL) IF (CMAKE_BUILD_TYPE MATCHES "Debug") LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES_DEBUG - ${Boost_THREAD_LIBRARY_DEBUG} ${Boost_SERIALIZATION_LIBRARY_DEBUG} + ${Boost_SERIALIZATION_LIBRARY_DEBUG} + ${Boost_SYSTEM_LIBRARY_DEBUG} + ${Boost_THREAD_LIBRARY_DEBUG} ) ENDIF() IF (CMAKE_BUILD_TYPE MATCHES "Release") LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES_RELEASE - ${Boost_THREAD_LIBRARY_RELEASE} ${Boost_SERIALIZATION_LIBRARY_RELEASE} + ${Boost_SERIALIZATION_LIBRARY_RELEASE} + ${Boost_SYSTEM_LIBRARY_RELEASE} + ${Boost_THREAD_LIBRARY_RELEASE} ) ENDIF() ENDMACRO() -- 2.39.5