[Cmake-commits] CMake branch, next, updated. v3.0.2-5689-gbefff63
Rolf Eike Beer
eike at sf-mail.de
Wed Oct 8 11:57:22 EDT 2014
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, next has been updated
via befff631d3658c2178f2e75add482f360ec73b5a (commit)
via 36f4c2a3ea1418599009d8b8d8fb0ab768614e70 (commit)
from 72153e9ab836239896d69fa229824d512c3568f4 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=befff631d3658c2178f2e75add482f360ec73b5a
commit befff631d3658c2178f2e75add482f360ec73b5a
Merge: 72153e9 36f4c2a
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Oct 8 11:57:21 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 8 11:57:21 2014 -0400
Merge topic 'FindThreads_overhaul' into next
36f4c2a3 FindThreads: rename imported target to Threads::Threads
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36f4c2a3ea1418599009d8b8d8fb0ab768614e70
commit 36f4c2a3ea1418599009d8b8d8fb0ab768614e70
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Oct 8 17:57:12 2014 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Oct 8 17:57:12 2014 +0200
FindThreads: rename imported target to Threads::Threads
diff --git a/Modules/FindThreads.cmake b/Modules/FindThreads.cmake
index fdc1e93..a0bc4d1 100644
--- a/Modules/FindThreads.cmake
+++ b/Modules/FindThreads.cmake
@@ -18,7 +18,7 @@
#
# ::
#
-# CMake::Threads
+# Threads::Threads
#
# For systems with multiple thread libraries, caller can set
#
@@ -203,14 +203,14 @@ set(CMAKE_REQUIRED_QUIET ${CMAKE_REQUIRED_QUIET_SAVE})
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Threads DEFAULT_MSG Threads_FOUND)
-if(THREADS_FOUND AND NOT TARGET CMake::Threads)
- add_library(CMake::Threads INTERFACE IMPORTED)
+if(THREADS_FOUND AND NOT TARGET Threads::Threads)
+ add_library(Threads::Threads INTERFACE IMPORTED)
if(THREADS_HAVE_PTHREAD_ARG)
- set_property(TARGET CMake::Threads PROPERTY INTERFACE_COMPILE_OPTIONS "-pthread")
+ set_property(TARGET Threads::Threads PROPERTY INTERFACE_COMPILE_OPTIONS "-pthread")
endif()
if(CMAKE_THREAD_LIBS_INIT)
- set_property(TARGET CMake::Threads PROPERTY INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
+ set_property(TARGET Threads::Threads PROPERTY INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
endif()
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindThreads.cmake | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list