diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2014-02-03 12:58:37 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2014-02-03 14:39:15 +0100 |
| commit | c571cd84028c82737f42aef75c026b133893683f (patch) | |
| tree | 7bb0a877b35ce9b1cd91ac69b1b974cec075ee08 | |
| parent | b049e126520af650092598e15fd807fa3e9c919b (diff) | |
| download | libssh-c571cd84028c82737f42aef75c026b133893683f.tar.gz libssh-c571cd84028c82737f42aef75c026b133893683f.tar.xz libssh-c571cd84028c82737f42aef75c026b133893683f.zip | |
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 <asn@cryptomilk.org>
| -rw-r--r-- | src/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
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) |