[CMake] Further Apple M1 path improvements #2589
Merged
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
The `BerkeleyDB_ROOT_DIR` CMake variable only expects a single path instead of a list when no cache exists, so use the build host CPU arch to determine the correct path to pass to the build system. Apple Silicon homebrew path is (by default) `/opt/homebrew`, whereas Intel hombrew path is `/usr/local`
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.
A couple more updates to CMake builds on Apple Silicon (M1) based systems:
BerkeleyDB_ROOT_DIRtop-level variable is expected to be only a single path, and not a list, so use build host processor logic to conditionally set it.mocbinary weren't including the apple silicon based homebrew path, which was resulting in a failure to find the program.Since the ability to test these changes by others on native M1 hardware is limited, and CI doesn't yet give us the opportunity to test in a M1 CI environment, it would suffice to simply verify that non-M1 builds are unaffected by these changes.