Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

simplify openssl setup in cmakelists #7278

Merged
merged 1 commit into from
May 6, 2019
Merged

Conversation

spoonincode
Copy link
Contributor

Change Description

Much of the openssl setup in the cmakelists is redundant or wrong. OPENSSL_INCLUDE_DIR is an output variable so we shouldn't be setting that. The openssl finding logic built in to cmake already looks at the OPENSSL_ROOT_DIR environment variable on its own so don't need to try to pass that. And on any unix it will already search for a pkgconfig file for openssl so don't really need to do anything on linux.

We do still need to keep something here for macOS as for whatever reason homebrew doesn't link in openssl's pkgconfig file (maybe due to concern of conflict?)

Consensus Changes

  • Consensus Changes

API Changes

  • API Changes

Documentation Additions

  • Documentation Additions

Much of the openssl setup in the cmakelists is redundant or wrong. OPENSSL_INCLUDE_DIR is an output variable so we shouldn't be setting that. The openssl finding logic built in to cmake already looks at the OPENSSL_ROOT_DIR environment variable on its own so don't need to try to pass that. And on any unix it will already search for a pkgconfig file for openssl so don't really need to do anything on linux.

We do still need to keep something here for macOS as for whatever reason homebrew doesn't link in openssl's pkgconfig file (maybe due to concern of conflict?)
@spoonincode spoonincode merged commit 463427d into develop May 6, 2019
@spoonincode spoonincode deleted the simplify_openssl_check branch May 6, 2019 23:41
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants