[Cmake-commits] CMake branch, next, updated. v3.0.2-5559-ge04d423

Rolf Eike Beer eike at sf-mail.de
Thu Oct 2 16:16:07 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  e04d423cbbe03519d4b81c78921649ac5e2e9bdf (commit)
       via  cbd5db64851109c8cd8e633ed6b7b2ab88918f3e (commit)
      from  0463ddc7f48b63dbfad1719984d787dfd8c1e292 (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=e04d423cbbe03519d4b81c78921649ac5e2e9bdf
commit e04d423cbbe03519d4b81c78921649ac5e2e9bdf
Merge: 0463ddc cbd5db6
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Oct 2 16:16:06 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 2 16:16:06 2014 -0400

    Merge topic 'FindThreads-dir' into next
    
    cbd5db64 FindThreads: search test source relative to module


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cbd5db64851109c8cd8e633ed6b7b2ab88918f3e
commit cbd5db64851109c8cd8e633ed6b7b2ab88918f3e
Author:     Timo Rothenpieler <btbn at btbn.de>
AuthorDate: Thu Oct 2 21:47:36 2014 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Oct 2 22:13:44 2014 +0200

    FindThreads: search test source relative to module
    
    This is a simpler way to reference the location of FindThreads.cmake.

diff --git a/Modules/FindThreads.cmake b/Modules/FindThreads.cmake
index 6050dcd..86ccb96 100644
--- a/Modules/FindThreads.cmake
+++ b/Modules/FindThreads.cmake
@@ -101,7 +101,7 @@ else()
         message(STATUS "Check if compiler accepts -pthread")
         try_run(THREADS_PTHREAD_ARG THREADS_HAVE_PTHREAD_ARG
           ${CMAKE_BINARY_DIR}
-          ${CMAKE_ROOT}/Modules/CheckForPthreads.c
+          ${CMAKE_CURRENT_LIST_DIR}/CheckForPthreads.c
           CMAKE_FLAGS -DLINK_LIBRARIES:STRING=-pthread
           COMPILE_OUTPUT_VARIABLE OUTPUT)
 

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

Summary of changes:
 Modules/FindThreads.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list