[Cmake-commits] CMake branch, next, updated. v3.3.2-3233-g43218af

[Brad King]

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  43218affaaa2acd87e1b9e91f7de6947cc694e4d (commit)
       via  fe4a12530e09bc66be61ce9972250bfe26478a8a (commit)
       via  296e684caf35a26d312e9a638c34df9e27caea16 (commit)
      from  924cade82a7f70b68390d2745ec1075a1ef6145b (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43218affaaa2acd87e1b9e91f7de6947cc694e4d
commit 43218affaaa2acd87e1b9e91f7de6947cc694e4d
Merge: 924cade fe4a125
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 24 08:43:02 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 24 08:43:02 2015 -0400

    Merge topic 'Threads-CXX' into next
    
    fe4a1253 fixup! Check(Function|Library|Symbol)Exists: make it work if only C++
    296e684c fixup! FindThreads: fix printing a pointer value in test code


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe4a12530e09bc66be61ce9972250bfe26478a8a
commit fe4a12530e09bc66be61ce9972250bfe26478a8a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 24 08:36:22 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 24 08:36:22 2015 -0400

    fixup! Check(Function|Library|Symbol)Exists: make it work if only C++

diff --git a/Modules/CheckFunctionExists.c b/Modules/CheckFunctionExists.c
index 607b3e8..fd29618 100644
--- a/Modules/CheckFunctionExists.c
+++ b/Modules/CheckFunctionExists.c
@@ -1,5 +1,8 @@
 #ifdef CHECK_FUNCTION_EXISTS
 
+#ifdef __cplusplus
+extern "C"
+#endif
 char CHECK_FUNCTION_EXISTS();
 #ifdef __CLASSIC_C__
 int main(){

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=296e684caf35a26d312e9a638c34df9e27caea16
commit 296e684caf35a26d312e9a638c34df9e27caea16
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 24 08:33:26 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 24 08:33:28 2015 -0400

    fixup! FindThreads: fix printing a pointer value in test code
    
    Do not depend on C++ streams for detecting thread support.

diff --git a/Modules/CheckForPthreads.c b/Modules/CheckForPthreads.c
index 4101552..2732957 100644
--- a/Modules/CheckForPthreads.c
+++ b/Modules/CheckForPthreads.c
@@ -1,9 +1,6 @@
 #include <stdio.h>
 #include <pthread.h>
 #include <unistd.h>
-#ifdef __cplusplus
-#include <iostream>
-#endif /* C++ */
 
 void* runner(void*);
 
@@ -34,11 +31,7 @@ void* runner(void* args)
   int cc;
   for ( cc = 0; cc < 10; cc ++ )
     {
-#ifdef __cplusplus
-    std::cout << args << cc;
-#else
     printf("%p CC: %d\n", args, cc);
-#endif /* C++ */
     }
   res ++;
   return 0;

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

Summary of changes:
 Modules/CheckForPthreads.c    |    7 -------
 Modules/CheckFunctionExists.c |    3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake