- Notifications
You must be signed in to change notification settings - Fork425
OSX: fix OpenSSL detection for 10.11. Fixes #690#691
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
Changes from1 commit
File filter
Filter by extension
Conversations
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) | ||
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 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. I'm not a fan of requiring homebrew just like this unconditionally on APPLE. Personally, when I build the library I provide the I'd be open to accepting this if you make it so that we can detect whether the user has homebrew installed (something that could be checked at configuration time). There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. @deanberris Agreed. I'll make the changes. If possible, maybe I should only apply this to OSX 10.11 since other versions appear unaffected? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. I think optional homebrew applies even to before OSX 10.11. | ||
OUTPUT_VARIABLE OPENSSL_ROOT_DIR | ||
OUTPUT_STRIP_TRAILING_WHITESPACE) | ||
endif() | ||
endif() | ||
find_package(OpenSSL) | ||
endif() | ||
find_package( Threads ) | ||