]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
CMake: Fix underlinkage with external boost-1.52 [1]
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 8 Mar 2013 23:05:21 +0000 (23:05 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 8 Mar 2013 23:05:21 +0000 (23:05 +0000)
[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

index b3548d23b4f055d6884567a6325486d4407f46fe..b5cbc1e6ae777db8e06a76d5b234feeaafec00af 100644 (file)
@@ -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()

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.