From 4e04ec8bf57bdb27ceb84867e04105b2820d3e1f Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Mon, 3 Feb 2014 12:58:37 +0200 Subject: threads: Be less strict when deciding whether to build libssh_threads. As mentioned in the previous commit, there are cases where CMAKE_HAVE_THREADS_LIBRARY is not set and pthreads _is_ being used: one can pass -DTHREADS_HAVE_PTHREAD_ARG=1 to CMake directly so that it just passes -pthread to the compiler/linker and does not set CMAKE_HAVE_THREADS_LIBRARY. Since we are only interested in knowing whether any threading library has been found, we should use CMAKE_THREAD_LIBS_INIT instead (Threads_FOUND would also work). Note that, at the moment, there is only a pthreads backend available in threads/, so if it is not found configuration will fail because CMake will try to create a library from an empty set of source files. Reviewed-by: Andreas Schneider --- src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 83435d0c..fa8c5c25 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -288,6 +288,6 @@ if (WITH_STATIC_LIB) ) endif (WITH_STATIC_LIB) -if (CMAKE_HAVE_THREADS_LIBRARY) +if (CMAKE_THREAD_LIBS_INIT) add_subdirectory(threads) -endif (CMAKE_HAVE_THREADS_LIBRARY) +endif (CMAKE_THREAD_LIBS_INIT) -- cgit