Skip to content

Commit acb020b

Browse files
committed
OSX: update OpenSSL detection. Refs cpp-netlib#690 cpp-netlib#691
1 parent b8c47f9 commit acb020b

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

CMakeLists.txt

+17-9
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,23 @@ set(Boost_USE_MULTI_THREADED ON)
4949
find_package(Boost 1.58.0 REQUIRED COMPONENTS system thread)
5050

5151
if (CPP-NETLIB_ENABLE_HTTPS)
52-
if (APPLE)
53-
# If we're on OS X check for Homebrew's copy of OpenSSL instead of Apple's
54-
if (NOT OpenSSL_DIR)
55-
execute_process (COMMAND brew --prefix openssl
56-
OUTPUT_VARIABLE OPENSSL_ROOT_DIR
57-
OUTPUT_STRIP_TRAILING_WHITESPACE)
58-
endif()
59-
endif()
60-
find_package(OpenSSL)
52+
if (APPLE)
53+
# If we're on OS X check for Homebrew's copy of OpenSSL instead of Apple's
54+
if (NOT OpenSSL_DIR)
55+
find_program(HOMEBREW brew)
56+
if (HOMEBREW STREQUAL "HOMEBREW-NOTFOUND")
57+
message(WARNING "Homebrew not found: not using Homebrew's OpenSSL")
58+
if (NOT OPENSSL_ROOT_DIR)
59+
message(WARNING "Use -DOPENSSL_ROOT_DIR for non-Apple OpenSSL")
60+
endif()
61+
else()
62+
execute_process(COMMAND brew --prefix openssl
63+
OUTPUT_VARIABLE OPENSSL_ROOT_DIR
64+
OUTPUT_STRIP_TRAILING_WHITESPACE)
65+
endif()
66+
endif()
67+
endif()
68+
find_package(OpenSSL)
6169
endif()
6270

6371
find_package( Threads )

0 commit comments

Comments
 (0)