Skip to content

Change to CMakeLists.txt to allow for arm64 builds#1697

Merged
rhinoella merged 4 commits into
developfrom
osx-arch-flag
Nov 16, 2023
Merged

Change to CMakeLists.txt to allow for arm64 builds#1697
rhinoella merged 4 commits into
developfrom
osx-arch-flag

Conversation

@rhinoella
Copy link
Copy Markdown
Contributor

CMAKE_OSX_ARCHITECTURE flag in CMakeLists.txt is being set to "x86_64" which prevents builds for arm64. This PR changes it so that the flag will only be set to x86 if there is none specified. Part of addressing #1695.

@rhinoella rhinoella added the Only: OSX Only affects OSX label Nov 10, 2023
@rhinoella rhinoella self-assigned this Nov 10, 2023
@rhinoella rhinoella requested a review from trisyoungs November 10, 2023 16:13
@rhinoella rhinoella merged commit d5dc309 into develop Nov 16, 2023
@rhinoella rhinoella deleted the osx-arch-flag branch November 16, 2023 10:53
rprospero pushed a commit that referenced this pull request Mar 11, 2024
Co-authored-by: Spitz <noella.spitz@ndw2544mac.isis.cclrc.ac.uk>
rprospero pushed a commit that referenced this pull request Apr 8, 2024
Co-authored-by: Spitz <noella.spitz@ndw2544mac.isis.cclrc.ac.uk>
rprospero pushed a commit that referenced this pull request Apr 9, 2024
Co-authored-by: Spitz <noella.spitz@ndw2544mac.isis.cclrc.ac.uk>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Only: OSX Only affects OSX

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants