Subject: Add -lpthread when using Boost::Thread.
Author: Kai Wasserbäch <debian@carbon-project.org>
Origin: vendor
Last-Update: 2011-01-16
Bug: http://public.kitware.com/Bug/view.php?id=10692
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=563479
Forwarded: no
---
 Modules/FindBoost.cmake |    3 +++
 1 file changed, 3 insertions(+)

--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1121,6 +1121,9 @@ else(_boost_IN_CACHE)
             message (STATUS "  ${COMPONENT}")
           endif(NOT Boost_FIND_QUIETLY)
           set(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${UPPERCOMPONENT}_LIBRARY})
+          if(${UPPERCOMPONENT} STREQUAL "THREAD" AND UNIX)
+            set(Boost_LIBRARIES ${Boost_LIBRARIES} pthread)
+          endif(${UPPERCOMPONENT} STREQUAL "THREAD" AND UNIX)
         endif( Boost_${UPPERCOMPONENT}_FOUND )
       endforeach(COMPONENT)
   else()

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index c3ac424..e691011 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -225,7 +225,7 @@
 # Copyright 2007      Wengo
 # Copyright 2007      Mike Jackson
 # Copyright 2008      Andreas Pakulat <apaku@gmx.de>
-# Copyright 2008-2010 Philip Lowman <philip@yhbt.com>
+# Copyright 2008-2011 Philip Lowman <philip@yhbt.com>
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
@@ -370,6 +370,22 @@ function(_Boost_CHECK_SPELLING _var)
   endif()
 endfunction()
 
+function(_Boost_consider_adding_pthreads _outvar)
+  # On Unix platforms (excluding cygwin) add pthreads to Boost_LIBRARIES
+  # if the user is searching for the boost-thread component.
+  if(UNIX AND NOT CYGWIN)
+    list(FIND Boost_FIND_COMPONENTS thread _using_boost_thread)
+    if(_using_boost_thread GREATER -1)
+      find_library(BOOST_THREAD_LIBRARY NAMES pthread
+                   DOC "The threading library used by boost-thread"
+      )
+      if(BOOST_THREAD_LIBRARY)
+        set(${_outvar} ${ARGN} ${BOOST_THREAD_LIBRARY} PARENT_SCOPE)
+      endif()
+    endif()
+  endif()
+endfunction()
+
 #
 # End functions/macros
 #  
@@ -451,6 +467,7 @@ if(_boost_IN_CACHE)
     _Boost_ADJUST_LIB_VARS( ${COMPONENT} )
     set(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${COMPONENT}_LIBRARY})
   endforeach(COMPONENT)
+  _Boost_consider_adding_pthreads(Boost_LIBRARIES ${Boost_LIBRARIES})
   set(Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIR})
   if(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
     math(EXPR Boost_MAJOR_VERSION "${Boost_VERSION} / 100000")
@@ -1130,6 +1147,7 @@ else(_boost_IN_CACHE)
           set(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${UPPERCOMPONENT}_LIBRARY})
         endif( Boost_${UPPERCOMPONENT}_FOUND )
       endforeach(COMPONENT)
+      _Boost_consider_adding_pthreads(Boost_LIBRARIES ${Boost_LIBRARIES})
   else()
     if(Boost_FIND_REQUIRED)
       message(SEND_ERROR "Unable to find the requested Boost libraries.\n${Boost_ERROR_REASON}")

Subject: Add -lpthread when using Boost::Thread.
Author: Philip Lowman <debian@carbon-project.org>
Author: Modestas Vainius <modax@debian.org>
Origin: other, https://public.kitware.com/Bug/file/3929/FindBoost%2Badd_pthread_if_boost_threads_is_in_use.diff
Last-Update: 2013-03-16
Bug: http://cmake.org/Bug/view.php?id=10692
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=563479
Forwarded: https://public.kitware.com/Bug/file/3629/FindBoost_add_-lpthread_%23563479.diff

--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -409,6 +409,22 @@ function(_Boost_GUESS_COMPILER_PREFIX _r
   set(${_ret} ${_boost_COMPILER} PARENT_SCOPE)
 endfunction()
 
+function(_Boost_consider_adding_pthreads _outvar)
+  # On Unix platforms (excluding cygwin) add pthreads to Boost_LIBRARIES
+  # if the user is searching for the boost-thread component.
+  if(UNIX AND NOT CYGWIN)
+    list(FIND Boost_FIND_COMPONENTS thread _using_boost_thread)
+    if(_using_boost_thread GREATER -1)
+      find_library(BOOST_THREAD_LIBRARY NAMES pthread
+                   DOC "The threading library used by boost-thread"
+      )
+      if(BOOST_THREAD_LIBRARY)
+        set(${_outvar} ${ARGN} ${BOOST_THREAD_LIBRARY} PARENT_SCOPE)
+      endif()
+    endif()
+  endif()
+endfunction()
+
 #
 # End functions/macros
 #
@@ -1091,6 +1107,9 @@ if(Boost_FOUND)
       list(APPEND Boost_LIBRARIES ${Boost_${UPPERCOMPONENT}_LIBRARY})
     endif()
   endforeach()
+
+  # Add pthread library on UNIX if thread component was found
+  _Boost_consider_adding_pthreads(Boost_LIBRARIES ${Boost_LIBRARIES})
 else()
   if(Boost_FIND_REQUIRED)
     message(SEND_ERROR "Unable to find the requested Boost libraries.\n${Boost_ERROR_REASON}")