From f45dc29eb235b29d7dc9e86a239189c2473d44f7 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 8 Sep 2010 16:51:55 +0200 Subject: build: Improve pthread detection. --- ConfigureChecks.cmake | 4 ++-- src/threads/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 7c059454..9abdd750 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -128,9 +128,9 @@ if (Z_LIBRARY) endif (Z_LIBRARY) if (CMAKE_HAVE_THREADS_LIBRARY) - if (CMAKE_HAVE_PTHREADS_CREATE OR CMAKE_HAVE_PTHREAD_CREATE) + if (CMAKE_USE_PTHREADS_INIT) set(HAVE_PTHREAD 1) - endif (CMAKE_HAVE_PTHREADS_CREATE OR CMAKE_HAVE_PTHREAD_CREATE) + endif (CMAKE_USE_PTHREADS_INIT) endif (CMAKE_HAVE_THREADS_LIBRARY) # OPTIONS diff --git a/src/threads/CMakeLists.txt b/src/threads/CMakeLists.txt index 74d98dcb..953988f2 100644 --- a/src/threads/CMakeLists.txt +++ b/src/threads/CMakeLists.txt @@ -31,7 +31,7 @@ set(libssh_threads_SRCS ) # build and link pthread -if (CMAKE_HAVE_PTHREADS_CREATE OR CMAKE_HAVE_PTHREAD_CREATE) +if (CMAKE_USE_PTHREADS_INIT) set(libssh_threads_SRCS ${libssh_threads_SRCS} pthread.c @@ -41,7 +41,7 @@ if (CMAKE_HAVE_PTHREADS_CREATE OR CMAKE_HAVE_PTHREAD_CREATE) ${LIBSSH_THREADS_LINK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) -endif (CMAKE_HAVE_PTHREADS_CREATE OR CMAKE_HAVE_PTHREAD_CREATE) +endif (CMAKE_USE_PTHREADS_INIT) set(LIBSSH_THREADS_LINK_LIBRARIES ${LIBSSH_THREADS_LINK_LIBRARIES} -- cgit v1.2.3