summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri@ouroboros.rocks>2024-07-20 13:21:32 +0200
committerSander Vrijders <sander@ouroboros.rocks>2024-07-22 14:08:51 +0200
commit2993bb58338dfcd8404fe8474d0addeb32480313 (patch)
tree717f6a3cf98c7347983435f015efe436c469f4ec
parenta1e455b30e9ed52eddc6d6056bef7fc02b4e251b (diff)
downloadouroboros-2993bb58338dfcd8404fe8474d0addeb32480313.tar.gz
ouroboros-2993bb58338dfcd8404fe8474d0addeb32480313.zip
build: Fix build without openSSL installedHEAD0.21.4testingmaster
The library was still trying to link against OpenSSL on OS X after it was uninstalled. Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks> Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/lib/CMakeLists.txt10
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 "")