diff options
| author | Andreas Schuh <andreas.schuh.84@gmail.com> | 2014-03-17 12:38:41 +0000 |
|---|---|---|
| committer | Andreas Schuh <andreas.schuh.84@gmail.com> | 2014-03-17 12:38:41 +0000 |
| commit | 1b1b61d3056e678154fcd637dfd754761f0780dc (patch) | |
| tree | 61880ed062abe193ccdade76c9dde7ac76644f38 /cmake | |
| parent | c5627a75bcb45c10619509696ce41d761c659f78 (diff) | |
| download | gflags-1b1b61d3056e678154fcd637dfd754761f0780dc.tar.gz gflags-1b1b61d3056e678154fcd637dfd754761f0780dc.tar.bz2 gflags-1b1b61d3056e678154fcd637dfd754761f0780dc.zip | |
Fix previous change of FindThreadsCxx.cmake by copying needed source file from CMake installation, changing the file name extension only.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CheckForPthreads.cxx | 38 | ||||
| -rw-r--r-- | cmake/FindThreadsCxx.cmake | 3 |
2 files changed, 2 insertions, 39 deletions
diff --git a/cmake/CheckForPthreads.cxx b/cmake/CheckForPthreads.cxx deleted file mode 100644 index 7250fbf..0000000 --- a/cmake/CheckForPthreads.cxx +++ /dev/null @@ -1,38 +0,0 @@ -#include <stdio.h> -#include <pthread.h> -#include <unistd.h> - -void* runner(void*); - -int res = 0; -#ifdef __CLASSIC_C__ -int main(){ - int ac; - char*av[]; -#else -int main(int ac, char*av[]){ -#endif - pthread_t tid[2]; - pthread_create(&tid[0], 0, runner, (void*)1); - pthread_create(&tid[1], 0, runner, (void*)2); - -#if defined(__BEOS__) && !defined(__ZETA__) // (no usleep on BeOS 5.) - usleep(1); // for strange behavior on single-processor sun -#endif - - pthread_join(tid[0], 0); - pthread_join(tid[1], 0); - if(ac > 1000){return *av[0];} - return res; -} - -void* runner(void* args) -{ - int cc; - for ( cc = 0; cc < 10; cc ++ ) - { - printf("%d CC: %d\n", (int)args, cc); - } - res ++; - return 0; -} diff --git a/cmake/FindThreadsCxx.cmake b/cmake/FindThreadsCxx.cmake index cdea511..625b826 100644 --- a/cmake/FindThreadsCxx.cmake +++ b/cmake/FindThreadsCxx.cmake @@ -98,9 +98,10 @@ else() # If we did not found -lpthread, -lpthread, or -lthread, look for -pthread if("THREADS_HAVE_PTHREAD_ARG" MATCHES "^THREADS_HAVE_PTHREAD_ARG") message(STATUS "Check if compiler accepts -pthread") + configure_file ("${CMAKE_ROOT}/Modules/CheckForPthreads.c" "${CMAKE_BINARY_DIR}/CheckForPthreads.cxx" COPYONLY) try_run(THREADS_PTHREAD_ARG THREADS_HAVE_PTHREAD_ARG ${CMAKE_BINARY_DIR} - ${CMAKE_ROOT}/Modules/CheckForPthreads.cxx + ${CMAKE_BINARY_DIR}/CheckForPthreads.cxx CMAKE_FLAGS -DLINK_LIBRARIES:STRING=-pthread COMPILE_OUTPUT_VARIABLE OUTPUT) |