[Cmake-commits] CMake branch, next, updated. v3.3.2-3178-g6685dcd

Rolf Eike Beer eike at sf-mail.de
Mon Sep 21 15:17:24 EDT 2015


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  6685dcd54221f56e1047142fd728000c9484101a (commit)
       via  5ba56a89c82689102294b412784d9c938cf7f472 (commit)
      from  6930abc0d88ae587a717b9343780ac32499da4c1 (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=6685dcd54221f56e1047142fd728000c9484101a
commit 6685dcd54221f56e1047142fd728000c9484101a
Merge: 6930abc 5ba56a8
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Sep 21 15:17:24 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 21 15:17:24 2015 -0400

    Merge topic 'Threads-CXX' into next
    
    5ba56a89 fixup Threads test


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ba56a89c82689102294b412784d9c938cf7f472
commit 5ba56a89c82689102294b412784d9c938cf7f472
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Sep 21 21:17:14 2015 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Sep 21 21:17:14 2015 +0200

    fixup Threads test

diff --git a/Tests/FindThreads/C-only/CMakeLists.txt b/Tests/FindThreads/C-only/CMakeLists.txt
index ffbb8b1..ab4ca0d 100644
--- a/Tests/FindThreads/C-only/CMakeLists.txt
+++ b/Tests/FindThreads/C-only/CMakeLists.txt
@@ -4,5 +4,7 @@ project(FindThreads_C-only C)
 set(CMAKE_THREAD_PREFER_PTHREAD On)
 find_package(Threads REQUIRED)
 
-add_executable(thr ${CMAKE_CURRENT_SOURCE_DIR}/../../../Modules/CheckForPthreads.c)
-target_link_libraries(thr Threads::Threads)
+if (NOT WIN32)
+  add_executable(thr ${CMAKE_CURRENT_SOURCE_DIR}/../../../Modules/CheckForPthreads.c)
+  target_link_libraries(thr Threads::Threads)
+endif ()

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

Summary of changes:
 Tests/FindThreads/C-only/CMakeLists.txt |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list