From 2993bb58338dfcd8404fe8474d0addeb32480313 Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Sat, 20 Jul 2024 13:21:32 +0200 Subject: build: Fix build without openSSL installed The library was still trying to link against OpenSSL on OS X after it was uninstalled. Signed-off-by: Dimitri Staessens Signed-off-by: Sander Vrijders --- CMakeLists.txt | 2 +- src/lib/CMakeLists.txt | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d32f881..5a259431 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ include(GNUInstallDirs) set(PACKAGE_VERSION_MAJOR 0) set(PACKAGE_VERSION_MINOR 21) -set(PACKAGE_VERSION_PATCH 3) +set(PACKAGE_VERSION_PATCH 4) set(PACKAGE_NAME "${CMAKE_PROJECT_NAME}") set(PACKAGE_DESCRIPTION "The Ouroboros prototype") diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index a6d7ac98..231eb785 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -46,6 +46,9 @@ if (HAVE_ROBUST_MUTEX) message(STATUS "Robust mutex support disabled by user") unset(HAVE_ROBUST_MUTEX) endif () +else() + message(STATUS "Robust mutex support not available") + unset(HAVE_ROBUST_MUTEX) endif () find_library(FUSE_LIBRARIES fuse QUIET) @@ -118,9 +121,10 @@ if (OPENSSL_FOUND) unset(HAVE_OPENSSL) endif() endif () -endif () - -if (NOT HAVE_OPENSSL_RNG) +else() + message(STATUS "Install openSSL version >= \"1.1.0\" to enable OpenSSL support") + unset(HAVE_OPENSSL_RNG) + unset(HAVE_OPENSSL) set(OPENSSL_INCLUDE_DIR "") set(OPENSSL_LIBRARIES "") set(OPENSSL_CRYPTO_LIBRARY "") -- cgit v1.2.3