Add cross compilation rules for macos arm64/x86 and optimize circleci/config.yml #3484
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
StasJ
requested changes
Nov 2, 2023
CMakeLists.txt
Outdated
| @@ -162,7 +157,6 @@ else() | |||
| endif() | |||
| endif() | |||
|
|
|||
| include_directories ("${PROJECT_SOURCE_DIR}/include") | |||
There was a problem hiding this comment.
I'm perplexed on how the test builds were successful across multiple platforms. I've re-added this line. Thanks for the catch.
CMakeLists.txt
Outdated
| else() | ||
| message("Building on macOS x86 architecture") | ||
| set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE) | ||
| set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "macOS build architecture" FORCE) |
There was a problem hiding this comment.
We should target the host architecture by default.
There was a problem hiding this comment.
Ok, native build platforms are now targeted by default. We can now target specific architectures by specifying CMAKE_OSX_ARCHITECTURES.
StasJ
approved these changes
Nov 3, 2023
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.
Fixes #3463. With CircleCI's deprecation of macOS/x86 executors, we need to start cross-compiling on arm64.
This PR also introduces reusable commands to reduce code repetition, and layer caching to save on compile time on the expensive M1 executors.