From b8c47f96ac54e3a2b0d40d908bdadffa11a6d01a Mon Sep 17 00:00:00 2001 From: anonimal Date: Mon, 3 Oct 2016 18:24:47 +0000 Subject: [PATCH 1/2] OSX: fix OpenSSL detection for 10.11. Fixes #690 --- CMakeLists.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d7c3d0e5..5c2e747f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,15 @@ set(Boost_USE_MULTI_THREADED ON) find_package(Boost 1.58.0 REQUIRED COMPONENTS system thread) if (CPP-NETLIB_ENABLE_HTTPS) - find_package( OpenSSL ) + if (APPLE) + # If we're on OS X check for Homebrew's copy of OpenSSL instead of Apple's + if (NOT OpenSSL_DIR) + execute_process (COMMAND brew --prefix openssl + OUTPUT_VARIABLE OPENSSL_ROOT_DIR + OUTPUT_STRIP_TRAILING_WHITESPACE) + endif() + endif() + find_package(OpenSSL) endif() find_package( Threads ) From acb020b64b4b3a279baf204fe5887b35b477e27a Mon Sep 17 00:00:00 2001 From: anonimal Date: Thu, 6 Oct 2016 19:44:46 +0000 Subject: [PATCH 2/2] OSX: update OpenSSL detection. Refs #690 #691 --- CMakeLists.txt | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c2e747f2..f77e69912 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,15 +49,23 @@ set(Boost_USE_MULTI_THREADED ON) find_package(Boost 1.58.0 REQUIRED COMPONENTS system thread) if (CPP-NETLIB_ENABLE_HTTPS) - if (APPLE) - # If we're on OS X check for Homebrew's copy of OpenSSL instead of Apple's - if (NOT OpenSSL_DIR) - execute_process (COMMAND brew --prefix openssl - OUTPUT_VARIABLE OPENSSL_ROOT_DIR - OUTPUT_STRIP_TRAILING_WHITESPACE) - endif() - endif() - find_package(OpenSSL) + if (APPLE) + # If we're on OS X check for Homebrew's copy of OpenSSL instead of Apple's + if (NOT OpenSSL_DIR) + find_program(HOMEBREW brew) + if (HOMEBREW STREQUAL "HOMEBREW-NOTFOUND") + message(WARNING "Homebrew not found: not using Homebrew's OpenSSL") + if (NOT OPENSSL_ROOT_DIR) + message(WARNING "Use -DOPENSSL_ROOT_DIR for non-Apple OpenSSL") + endif() + else() + execute_process(COMMAND brew --prefix openssl + OUTPUT_VARIABLE OPENSSL_ROOT_DIR + OUTPUT_STRIP_TRAILING_WHITESPACE) + endif() + endif() + endif() + find_package(OpenSSL) endif() find_package( Threads ) pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy