From 0bc2356ed5b587f4b4e41878a51b741e12901016 Mon Sep 17 00:00:00 2001
From: Mark Nunberg <mnunberg@haskalah.org>
Date: Wed, 6 Feb 2019 14:14:46 -0500
Subject: CMake: update for SSL

---
 CMakeLists.txt | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89ae962..4952083 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,8 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0)
 INCLUDE(GNUInstallDirs)
+PROJECT(hiredis)
+
+OPTION(HIREDIS_SSL "Link against OpenSSL" ON)
 
 MACRO(getVersionBit name)
   SET(VERSION_REGEX "^#define ${name} (.+)$")
@@ -27,7 +30,8 @@ ADD_LIBRARY(hiredis SHARED
     hiredis.c
     net.c
     read.c
-    sds.c)
+    sds.c
+    sslio.c)
 
 SET_TARGET_PROPERTIES(hiredis
     PROPERTIES
@@ -44,9 +48,22 @@ INSTALL(FILES hiredis.h read.h sds.h async.h
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/hiredis.pc
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
+IF(HIREDIS_SSL)
+    IF (NOT OPENSSL_ROOT_DIR)
+        IF (APPLE)
+            SET(OPENSSL_ROOT_DIR "/usr/local/opt/openssl")
+        ENDIF()
+    ENDIF()
+    FIND_PACKAGE(OpenSSL REQUIRED)
+    ADD_DEFINITIONS(-DHIREDIS_SSL)
+    INCLUDE_DIRECTORIES("${OPENSSL_INCLUDE_DIR}")
+    TARGET_LINK_LIBRARIES(hiredis ${OPENSSL_LIBRARIES})
+ENDIF()
+
 ENABLE_TESTING()
-ADD_EXECUTABLE(hiredis-test
-    test.c)
+ADD_EXECUTABLE(hiredis-test test.c)
+
+
 TARGET_LINK_LIBRARIES(hiredis-test hiredis)
 ADD_TEST(NAME hiredis-test
     COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/test.sh)
-- 
cgit v1.2.3


From 792bdbab7e781d1391adf242cb5fda33364ffeae Mon Sep 17 00:00:00 2001
From: Mark Nunberg <mnunberg@haskalah.org>
Date: Thu, 21 Feb 2019 12:04:53 -0500
Subject: cmake: ssl disabled by default

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4952083..cce2c61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0)
 INCLUDE(GNUInstallDirs)
 PROJECT(hiredis)
 
-OPTION(HIREDIS_SSL "Link against OpenSSL" ON)
+OPTION(HIREDIS_SSL "Link against OpenSSL" OFF)
 
 MACRO(getVersionBit name)
   SET(VERSION_REGEX "^#define ${name} (.+)$")
-- 
cgit v1.2.3