[Cmake-commits] CMake branch, next, updated. v3.0.2-5635-g174fa21

[Rolf Eike Beer]

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  174fa21256e0f958b45a50317e67898823aecf42 (commit)
       via  993c41d4f9ef73ed3f4e86bc4b422f82fe66077f (commit)
      from  e41e3a1f7f04856a8bc8bfcf5c54a8611f0e72ae (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=174fa21256e0f958b45a50317e67898823aecf42
commit 174fa21256e0f958b45a50317e67898823aecf42
Merge: e41e3a1 993c41d
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Oct 7 12:15:53 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 7 12:15:53 2014 -0400

    Merge topic 'FindThreads_overhaul' into next
    
    993c41d4 FindThreads: fix checking for CMake::Threads target


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=993c41d4f9ef73ed3f4e86bc4b422f82fe66077f
commit 993c41d4f9ef73ed3f4e86bc4b422f82fe66077f
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Oct 7 18:15:44 2014 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Oct 7 18:15:44 2014 +0200

    FindThreads: fix checking for CMake::Threads target

diff --git a/Modules/FindThreads.cmake b/Modules/FindThreads.cmake
index ee3d44c..fdc1e93 100644
--- a/Modules/FindThreads.cmake
+++ b/Modules/FindThreads.cmake
@@ -203,8 +203,8 @@ 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 HAVE_CMAKE_THREADS_TARGET)
-  add_library(CMake::Threads INTERFACE IMPORTED GLOBAL)
+if(THREADS_FOUND AND NOT TARGET CMake::Threads)
+  add_library(CMake::Threads INTERFACE IMPORTED)
 
   if(THREADS_HAVE_PTHREAD_ARG)
     set_property(TARGET CMake::Threads PROPERTY INTERFACE_COMPILE_OPTIONS "-pthread")
@@ -213,6 +213,4 @@ if(THREADS_FOUND AND NOT HAVE_CMAKE_THREADS_TARGET)
   if(CMAKE_THREAD_LIBS_INIT)
     set_property(TARGET CMake::Threads PROPERTY INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
   endif()
-
-  set(HAVE_CMAKE_THREADS_TARGET TRUE)
 endif()

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindThreads.cmake |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake