[Cmake-commits] CMake branch, next, updated. v3.0.2-5583-ga8a5bbc

[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  a8a5bbc3e305c360ed03b691de745dee42e8af0e (commit)
       via  9fd9ab659213c3d767bd6cd6180aef0449283943 (commit)
      from  436bc5909ddd293fe228878e3e2956a566d13bcb (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=a8a5bbc3e305c360ed03b691de745dee42e8af0e
commit a8a5bbc3e305c360ed03b691de745dee42e8af0e
Merge: 436bc59 9fd9ab6
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Oct 3 17:19:56 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 3 17:19:56 2014 -0400

    Merge topic 'FindThreads-macro' into next
    
    9fd9ab65 FindThreads: rename macro


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fd9ab659213c3d767bd6cd6180aef0449283943
commit 9fd9ab659213c3d767bd6cd6180aef0449283943
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Oct 3 23:19:13 2014 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Oct 3 23:19:13 2014 +0200

    FindThreads: rename macro

diff --git a/Modules/FindThreads.cmake b/Modules/FindThreads.cmake
index d51a1da..41444f5 100644
--- a/Modules/FindThreads.cmake
+++ b/Modules/FindThreads.cmake
@@ -45,7 +45,9 @@ if(CMAKE_SYSTEM_NAME MATCHES IRIX AND NOT CMAKE_THREAD_PREFER_PTHREAD)
   CHECK_INCLUDE_FILES("sys/types.h;sys/prctl.h"  CMAKE_HAVE_SPROC_H)
 endif()
 
-macro(check_threads_lib LIBNAME FUNCNAME VARNAME)
+# Internal helper macro.
+# Do NOT even think about using it outside of this file!
+macro(_check_threads_lib LIBNAME FUNCNAME VARNAME)
   if(NOT CMAKE_HAVE_THREADS_LIBRARY)
      CHECK_LIBRARY_EXISTS(${LIBNAME} ${FUNCNAME} "" ${VARNAME})
      if(${VARNAME})
@@ -78,11 +80,11 @@ else()
         set(Threads_FOUND TRUE)
       else()
 
-        check_threads_lib(pthreads pthread_create CMAKE_HAVE_PTHREADS_CREATE)
-        check_threads_lib(pthread  pthread_create CMAKE_HAVE_PTHREAD_CREATE)
+        _check_threads_lib(pthreads pthread_create CMAKE_HAVE_PTHREADS_CREATE)
+        _check_threads_lib(pthread  pthread_create CMAKE_HAVE_PTHREAD_CREATE)
         if(CMAKE_SYSTEM_NAME MATCHES "SunOS")
             # On sun also check for -lthread
-            check_threads_lib(thread thr_create CMAKE_HAVE_THR_CREATE)
+            _check_threads_lib(thread thr_create CMAKE_HAVE_THR_CREATE)
         endif()
       endif()
     endif()

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

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


hooks/post-receive
-- 
CMake