From 812f91d26e3606397adc6200c53ba58789a8a43a Mon Sep 17 00:00:00 2001
From: Kishore Nallan <kishore@kishorelive.com>
Date: Fri, 31 Mar 2017 18:06:08 +0530
Subject: [PATCH] Another attempt at fixing Mac OpenSSL build failure.

---
 CMakeLists.txt | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5be8fa1..6ad07e3b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,29 +9,28 @@ if(NOT EXISTS ${DEP_ROOT_DIR})
     file(MAKE_DIRECTORY ${DEP_ROOT_DIR})
 endif()
 
+if (APPLE)
+    add_definitions(-DGTEST_USE_OWN_TR1_TUPLE)
+    add_definitions(-D__GLIBCXX__)
+    set(OPENSSL_ROOT_DIR /usr/local/opt/openssl) # For Brew
+endif (APPLE)
+
+FIND_PACKAGE(OpenSSL REQUIRED)
+
 include(cmake/For.cmake)
 include(cmake/H2O.cmake)
 include(cmake/RocksDB.cmake)
 include(cmake/GoogleTest.cmake)
 include(cmake/TestResources.cmake)
 
-if (APPLE)
-    add_definitions(-DGTEST_USE_OWN_TR1_TUPLE)
-    add_definitions(-D__GLIBCXX__)
-
-    # For openssl installed with Brew
-    include_directories(/usr/local/opt/openssl/include)
-    link_directories(/usr/local/opt/openssl/lib)
-endif (APPLE)
-
 FILE(GLOB HEADER_FILES include/*)
 FILE(GLOB SRC_FILES src/*.cpp)
 
 include_directories(include)
+include_directories(${OPENSSL_INCLUDE_DIR})
 include_directories(${DEP_ROOT_DIR}/${FOR_NAME})
 include_directories(${DEP_ROOT_DIR}/${GTEST_NAME}/googletest/include)
 include_directories(${DEP_ROOT_DIR}/${H2O_NAME}/include)
-include_directories(${DEP_ROOT_DIR}/${H2O_NAME}/build/libressl-build/include)
 include_directories(${DEP_ROOT_DIR}/${ROCKSDB_NAME}/include)
 
 link_directories(${DEP_ROOT_DIR}/${GTEST_NAME}/googletest/build)
@@ -50,7 +49,7 @@ target_compile_definitions(search PRIVATE ROOT_DIR="${CMAKE_SOURCE_DIR}/")
 target_compile_definitions(benchmark PRIVATE ROOT_DIR="${CMAKE_SOURCE_DIR}/")
 target_compile_definitions(typesense_test PRIVATE ROOT_DIR="${CMAKE_SOURCE_DIR}/")
 
-target_link_libraries(typesense-server for h2o-evloop pthread rocksdb ssl crypto)
+target_link_libraries(typesense-server for h2o-evloop pthread rocksdb ${OPENSSL_LIBRARIES})
 target_link_libraries(search for pthread rocksdb)
 target_link_libraries(benchmark for pthread rocksdb)
 target_link_libraries(typesense_test pthread for rocksdb gtest gtest_main)