[Cmake-commits] CMake branch, master, updated. v3.13.0-rc3-369-ga027128
Kitware Robot
kwrobot at kitware.com
Fri Nov 9 11:43:05 EST 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via a02712840021706cea43bd10ebf742ef38c8f710 (commit)
via bd831ed0948a1e99f573f0056f2bee5d3b21009e (commit)
from 65522e5e0ef95b7424714ec4d67345bf00e9b8bd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a02712840021706cea43bd10ebf742ef38c8f710
commit a02712840021706cea43bd10ebf742ef38c8f710
Merge: 65522e5 bd831ed
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 9 16:38:01 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Nov 9 11:38:07 2018 -0500
Merge topic 'FindBoost-link-threads'
bd831ed094 FindBoost: Add system thread library to Boost_LIBRARIES
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2570
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd831ed0948a1e99f573f0056f2bee5d3b21009e
commit bd831ed0948a1e99f573f0056f2bee5d3b21009e
Author: Felix Geyer <debfx at fobos.de>
AuthorDate: Tue Nov 6 18:33:43 2018 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 9 10:38:45 2018 -0500
FindBoost: Add system thread library to Boost_LIBRARIES
Add the system thread library to Boost_LIBRARIES when the boost thread
component has been found.
The Boost::thread imported target already pulls in Threads::Threads.
This changes does the same for projects using the Boost_LIBRARIES variable
instead.
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index e983941..0794a6f 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -2074,6 +2074,9 @@ if(Boost_FOUND)
message (STATUS " ${COMPONENT}")
endif()
list(APPEND Boost_LIBRARIES ${Boost_${UPPERCOMPONENT}_LIBRARY})
+ if(COMPONENT STREQUAL "thread")
+ list(APPEND Boost_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+ endif()
endif()
endforeach()
else()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindBoost.cmake | 3 +++
1 file changed, 3 insertions(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list