diff options
| author | Alan Antonuk <alan.antonuk@gmail.com> | 2017-10-07 21:37:05 -0700 |
|---|---|---|
| committer | Alan Antonuk <alan.antonuk@gmail.com> | 2017-12-10 21:42:43 -0800 |
| commit | f7a0278c18bb8ac70ebc4a482b0e9c75154aebe9 (patch) | |
| tree | 3bde00ae59ed9b1c0ed35b651dceb2a63bdd25af /CMakeLists.txt | |
| parent | 9cb126c64759fd1294df5cfd4e16dcf938d40743 (diff) | |
| download | rabbitmq-c-f7a0278c18bb8ac70ebc4a482b0e9c75154aebe9.tar.gz | |
ssl: Make thread-safety unconditional in rabbitmq-c
Remove the option to disable thread-safety in the parts of rabbitmq-c
that use OpenSSL, making it a requirement for thread-safety to use SSL
with rabbitmq-c.
The existing #ifdef's are a source of additional complexity and the
non-thread-safe version is not well tested.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5aea03a..ce807a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.12) project(rabbitmq-c "C") # Enable MACOSX_RPATH by default. See: cmake --help-policy CMP0042 @@ -246,7 +246,6 @@ if (POPT_FOUND AND XmlTo_FOUND) set(DO_DOCS ON) endif() -find_package(Threads) option(BUILD_SHARED_LIBS "Build rabbitmq-c as a shared library" ON) option(BUILD_STATIC_LIBS "Build rabbitmq-c as a static library" ON) @@ -257,10 +256,14 @@ option(BUILD_TOOLS_DOCS "Build man pages for Tools (requires xmlto)" ${DO_DOCS}) option(BUILD_TESTS "Build tests (run tests with make test)" ON) option(BUILD_API_DOCS "Build Doxygen API docs" ${DOXYGEN_FOUND}) option(ENABLE_SSL_SUPPORT "Enable SSL support" ON) -option(ENABLE_THREAD_SAFETY "Enable thread safety when using OpenSSL" ${Threads_FOUND}) if (ENABLE_SSL_SUPPORT) find_package(OpenSSL 0.9.8 REQUIRED) + + cmake_push_check_state() + set(THREADS_PREFER_PTHREAD_FLAG ON) + find_package(Threads REQUIRED) + cmake_pop_check_state() endif() if (NOT BUILD_SHARED_LIBS AND NOT BUILD_STATIC_LIBS) @@ -309,12 +312,8 @@ endif () set(libs_private ${SOCKET_LIBRARIES} ${LIBRT}) if (ENABLE_SSL_SUPPORT) - if (SSL_ENGINE STREQUAL "OpenSSL") - set(requires_private "openssl") - endif() - if (ENABLE_THREAD_SAFETY) - set(libs_private ${libs_private} ${CMAKE_THREAD_LIBS_INIT}) - endif() + set(requires_private "openssl") + set(libs_private ${libs_private} ${CMAKE_THREAD_LIBS_INIT}) endif() set(prefix ${CMAKE_INSTALL_PREFIX}) |