diff options
author | Andreas Schneider <asn@cynapses.org> | 2010-09-01 15:15:17 +0200 |
---|---|---|
committer | Andreas Schneider <asn@cynapses.org> | 2010-09-01 15:15:17 +0200 |
commit | a93f2d8bfe98e2927fc7024973c52062ccd28b30 (patch) | |
tree | 7fea3f5be30c1914c2fe751291c8baa0b98d12c5 | |
parent | 8c55294ea9134c32f80d1a399a6a49ecdc9264b2 (diff) | |
download | libssh-a93f2d8bfe98e2927fc7024973c52062ccd28b30.tar.gz libssh-a93f2d8bfe98e2927fc7024973c52062ccd28b30.tar.xz libssh-a93f2d8bfe98e2927fc7024973c52062ccd28b30.zip |
build: Fixed pthread detection.
-rw-r--r-- | CMakeLists.txt | 6 | ||||
-rw-r--r-- | ConfigureChecks.cmake | 18 |
2 files changed, 13 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e7c5b6ce..0cd833b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,8 +62,10 @@ else (WITH_GCRYPT) endif (NOT OPENSSL_FOUND) endif(WITH_GCRYPT) -#find out if we have threading available -include(FindThreads) +# Find out if we have threading available +set(CMAKE_THREAD_PREFER_PTHREADS ON) +find_package(Threads) + # config.h checks include(ConfigureChecks.cmake) configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 4a1738be..6a8ab240 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -58,11 +58,9 @@ check_include_file(openssl/blowfish.h HAVE_OPENSSL_BLOWFISH_H) set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIRS}) check_include_file(openssl/des.h HAVE_OPENSSL_DES_H) -include(FindThreads) - -if(CMAKE_HAVE_PTHREAD_H) - set(HAVE_PTHREAD_H) -endif(CMAKE_HAVE_PTHREAD_H) +if (CMAKE_HAVE_PTHREAD_H) + set(HAVE_PTHREAD_H 1) +endif (CMAKE_HAVE_PTHREAD_H) # FUNCTIONS @@ -111,6 +109,12 @@ if (Z_LIBRARY) set(HAVE_LIBZ 1) endif (Z_LIBRARY) +if (CMAKE_HAVE_THREADS_LIBRARY) + set(HAVE_PTHREAD 1) + + set(LIBSSH_REQUIRED_LIBRARIES ${LIBSSH_REQUIRED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) +endif (CMAKE_HAVE_THREADS_LIBRARY) + # OPTIONS if (WITH_DEBUG_CRYPTO) set(DEBUG_CRYPTO 1) @@ -120,10 +124,6 @@ if (WITH_DEBUG_CALLTRACE) set(DEBUG_CALLTRACE 1) endif (WITH_DEBUG_CALLTRACE) -if (CMAKE_HAVE_PTHREAD_CREATE) - set(HAVE_PTHREAD) -endif (CMAKE_HAVE_PTHREAD_CREATE) - # ENDIAN if (NOT WIN32) test_big_endian(WORDS_BIGENDIAN) |