[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1454-g841457b

[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  841457b599ecae12da9b561f38c9e63f4b8f12a6 (commit)
       via  693f8bf34df5aaf22ed30039eff181352ed6574a (commit)
       via  858ce31f4cd8d247a6dd7b8ae70ab9a38f71e7a2 (commit)
       via  fdf7bd27a30fa53ae6f4239088444baba1d7f84e (commit)
      from  5481c267c3ff15008b2f71a46a39c454d64ef28a (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=841457b599ecae12da9b561f38c9e63f4b8f12a6
commit 841457b599ecae12da9b561f38c9e63f4b8f12a6
Merge: 5481c26 693f8bf
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Mar 26 12:35:06 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 26 12:35:06 2014 -0400

    Merge topic 'threads-cleanup' into next
    
    693f8bf3 FindThreads: simplify checking for SunOS
    858ce31f FindThreads: avoid useless checks if a thread library is already found
    fdf7bd27 FindThreads: replace MATCHES with STREQUAL


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=693f8bf34df5aaf22ed30039eff181352ed6574a
commit 693f8bf34df5aaf22ed30039eff181352ed6574a
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Mar 25 23:49:54 2014 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Mar 25 23:49:54 2014 +0100

    FindThreads: simplify checking for SunOS

diff --git a/Modules/FindThreads.cmake b/Modules/FindThreads.cmake
index ff8aa29..7f84522 100644
--- a/Modules/FindThreads.cmake
+++ b/Modules/FindThreads.cmake
@@ -80,7 +80,7 @@ else()
             set(CMAKE_HAVE_THREADS_LIBRARY 1)
             set(Threads_FOUND TRUE)
 
-          elseif(CMAKE_SYSTEM MATCHES "SunOS.*")
+          elseif(CMAKE_SYSTEM_NAME MATCHES "SunOS")
             # On sun also check for -lthread
             CHECK_LIBRARY_EXISTS(thread thr_create "" CMAKE_HAVE_THR_CREATE)
             if(CMAKE_HAVE_THR_CREATE)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=858ce31f4cd8d247a6dd7b8ae70ab9a38f71e7a2
commit 858ce31f4cd8d247a6dd7b8ae70ab9a38f71e7a2
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Mar 25 23:47:49 2014 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Mar 25 23:47:49 2014 +0100

    FindThreads: avoid useless checks if a thread library is already found

diff --git a/Modules/FindThreads.cmake b/Modules/FindThreads.cmake
index d7473a7..ff8aa29 100644
--- a/Modules/FindThreads.cmake
+++ b/Modules/FindThreads.cmake
@@ -63,32 +63,31 @@ else()
         set(CMAKE_THREAD_LIBS_INIT "")
         set(CMAKE_HAVE_THREADS_LIBRARY 1)
         set(Threads_FOUND TRUE)
-      endif()
+      else()
 
-      if(NOT CMAKE_HAVE_THREADS_LIBRARY)
         # Do we have -lpthreads
         CHECK_LIBRARY_EXISTS(pthreads pthread_create "" CMAKE_HAVE_PTHREADS_CREATE)
         if(CMAKE_HAVE_PTHREADS_CREATE)
           set(CMAKE_THREAD_LIBS_INIT "-lpthreads")
           set(CMAKE_HAVE_THREADS_LIBRARY 1)
           set(Threads_FOUND TRUE)
-        endif()
-
-        # Ok, how about -lpthread
-        CHECK_LIBRARY_EXISTS(pthread pthread_create "" CMAKE_HAVE_PTHREAD_CREATE)
-        if(CMAKE_HAVE_PTHREAD_CREATE)
-          set(CMAKE_THREAD_LIBS_INIT "-lpthread")
-          set(CMAKE_HAVE_THREADS_LIBRARY 1)
-          set(Threads_FOUND TRUE)
-        endif()
+        else()
 
-        if(CMAKE_SYSTEM MATCHES "SunOS.*")
-          # On sun also check for -lthread
-          CHECK_LIBRARY_EXISTS(thread thr_create "" CMAKE_HAVE_THR_CREATE)
-          if(CMAKE_HAVE_THR_CREATE)
-            set(CMAKE_THREAD_LIBS_INIT "-lthread")
+          # Ok, how about -lpthread
+          CHECK_LIBRARY_EXISTS(pthread pthread_create "" CMAKE_HAVE_PTHREAD_CREATE)
+          if(CMAKE_HAVE_PTHREAD_CREATE)
+            set(CMAKE_THREAD_LIBS_INIT "-lpthread")
             set(CMAKE_HAVE_THREADS_LIBRARY 1)
             set(Threads_FOUND TRUE)
+
+          elseif(CMAKE_SYSTEM MATCHES "SunOS.*")
+            # On sun also check for -lthread
+            CHECK_LIBRARY_EXISTS(thread thr_create "" CMAKE_HAVE_THR_CREATE)
+            if(CMAKE_HAVE_THR_CREATE)
+              set(CMAKE_THREAD_LIBS_INIT "-lthread")
+              set(CMAKE_HAVE_THREADS_LIBRARY 1)
+              set(Threads_FOUND TRUE)
+            endif()
           endif()
         endif()
       endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fdf7bd27a30fa53ae6f4239088444baba1d7f84e
commit fdf7bd27a30fa53ae6f4239088444baba1d7f84e
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Mar 25 22:46:11 2014 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Mar 25 22:46:11 2014 +0100

    FindThreads: replace MATCHES with STREQUAL

diff --git a/Modules/FindThreads.cmake b/Modules/FindThreads.cmake
index ec671bf..d7473a7 100644
--- a/Modules/FindThreads.cmake
+++ b/Modules/FindThreads.cmake
@@ -96,7 +96,7 @@ else()
 
     if(NOT CMAKE_HAVE_THREADS_LIBRARY)
       # If we did not found -lpthread, -lpthread, or -lthread, look for -pthread
-      if("THREADS_HAVE_PTHREAD_ARG" MATCHES "^THREADS_HAVE_PTHREAD_ARG")
+      if("x${THREADS_HAVE_PTHREAD_ARG}" STREQUAL "x")
         message(STATUS "Check if compiler accepts -pthread")
         try_run(THREADS_PTHREAD_ARG THREADS_HAVE_PTHREAD_ARG
           ${CMAKE_BINARY_DIR}

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

Summary of changes:
 Modules/FindThreads.cmake |   33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
CMake