Skip to content

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deanberris merged 2 commits into from
Oct 7, 2016
Merged

OSX: fix OpenSSL detection for 10.11. Fixes #690 #691

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8c47f9
OSX: fix OpenSSL detection for 10.11. Fixes #690
anonimal Oct 3, 2016
acb020b
OSX: update OpenSSL detection. Refs #690 #691
anonimal Oct 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
OSX: fix OpenSSL detection for 10.11. Fixes #690
  • Loading branch information
@anonimal
anonimal committed Oct 3, 2016
commit b8c47f96ac54e3a2b0d40d908bdadffa11a6d01a
10 changes: 9 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Copy Markdown
Member

@deanberris deanberris Oct 5, 2016

Choose a reason for hiding this comment

The 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 OpenSSL_DIR option myself.

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).

Copy link
Copy Markdown
Author

@anonimal anonimal Oct 5, 2016

Choose a reason for hiding this comment

The 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?

Copy link
Copy Markdown
Member

@deanberris deanberris Oct 6, 2016

Choose a reason for hiding this comment

The 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 )
Expand Down