[3.2] pick sane defaults for OPENSSL_ROOT_DIR on ARM macOS #504
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
heifner
reviewed
Jun 23, 2022
| @@ -54,7 +54,11 @@ set(ENABLE_MULTIVERSION_PROTOCOL_TEST FALSE CACHE BOOL "Enable nodeos multiversi | |||
|
|
|||
| # add defaults for openssl | |||
| if(APPLE AND UNIX AND "${OPENSSL_ROOT_DIR}" STREQUAL "") | |||
| set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl@3;/usr/local/opt/openssl@1.1") | |||
| if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") | |||
There was a problem hiding this comment.
Shouldn't this be something like if(APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
There was a problem hiding this comment.
It's inside of the if(APPLE AND UNIX AND "${OPENSSL_ROOT_DIR}" STREQUAL "") already; so it's def only going to apply to APPLE. Probably could condense this some by doing something like
if(APPLE AND UNIX AND "${OPENSSL_ROOT_DIR}" STREQUAL "" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
#one line for arm stuff
elseif(APPLE AND UNIX AND "${OPENSSL_ROOT_DIR}" STREQUAL "")
#one line for x86 stuff
endif()
But I suppose was trying to avoid the repetition of the APPLE AND UNIX AND "${OPENSSL_ROOT_DIR}" STREQUAL "" part.
heifner
approved these changes
Jun 23, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When doing a macos ARM build, use homebrew's default openssl location for default
OPENSSL_ROOT_DIR