[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2703-g727c411

[Clinton Stimpson]

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  727c411d064cb5c50c230f884f52417532334315 (commit)
       via  bec8e64c735f8953bfe4b26a886add17f11fe440 (commit)
       via  3423915720c10caf2531698d2482a4058d53293a (commit)
       via  8869c0febd20bf39da2263d95c2d1d4d21f04a1a (commit)
       via  8fe0f2be831e8980cb2a9d31a1449fb630cf2413 (commit)
       via  f1502d2f8891efa34a68e55d901dcf83d7b883c8 (commit)
      from  5a717d67a40e89961d846dd762b9787c3c6374b7 (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=727c411d064cb5c50c230f884f52417532334315
commit 727c411d064cb5c50c230f884f52417532334315
Merge: 5a717d6 bec8e64
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Apr 2 09:49:54 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 2 09:49:54 2013 -0400

    Merge topic 'qt4-pthread' into next
    
    bec8e64 Qt4: Fix typo setting a variable for FindThreads.
    3423915 CMake Nightly Date Stamp
    8869c0f CMake Nightly Date Stamp
    8fe0f2b CMake Nightly Date Stamp
    f1502d2 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bec8e64c735f8953bfe4b26a886add17f11fe440
commit bec8e64c735f8953bfe4b26a886add17f11fe440
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Apr 2 07:46:51 2013 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Tue Apr 2 07:46:51 2013 -0600

    Qt4: Fix typo setting a variable for FindThreads.
    
    Fixes bug 14055.

diff --git a/Modules/Qt4ConfigDependentSettings.cmake b/Modules/Qt4ConfigDependentSettings.cmake
index 6db5da1..88dc8ec 100644
--- a/Modules/Qt4ConfigDependentSettings.cmake
+++ b/Modules/Qt4ConfigDependentSettings.cmake
@@ -260,7 +260,7 @@ if(Q_WS_X11)
   # X11 libraries Qt always depends on
   set(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${X11_Xext_LIB} ${X11_X11_LIB})
 
-  set(CMAKE_THREAD_PREFER_PTHREADS 1)
+  set(CMAKE_THREAD_PREFER_PTHREAD 1)
   find_package(Threads)
   if(CMAKE_USE_PTHREADS_INIT)
     set(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${CMAKE_THREAD_LIBS_INIT})

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

Summary of changes:
 Modules/Qt4ConfigDependentSettings.cmake |    2 +-
 Source/CMakeVersion.cmake                |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake