-
-
Notifications
You must be signed in to change notification settings - Fork 3.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix for macOS on ARM #1971
Merged
Merged
Fix for macOS on ARM #1971
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
Codecov Report
@@ Coverage Diff @@
## master #1971 +/- ##
==========================================
+ Coverage 88.61% 88.62% +0.01%
==========================================
Files 138 138
Lines 5627 5624 -3
==========================================
- Hits 4986 4984 -2
+ Misses 641 640 -1 |
Thanks for the patch. Do note, that as per the contributing docs files in the |
I have reverted the change to single_include. |
pramodk
added a commit
to BlueBrain/nmodl
that referenced
this pull request
Feb 27, 2021
- Currently catch2 is header directly added in the project - Before switching to submodule (in separate PR), copying minimal fix from the upstream: catchorg/Catch2#1971 Fixes #527
pramodk
added a commit
to BlueBrain/nmodl
that referenced
this pull request
Feb 27, 2021
- Currently catch2 is header directly added in the project - Before switching to submodule (in separate PR), copying minimal fix from the upstream: catchorg/Catch2#1971 - Update INSTALL.md for Apple M1 Fixes #527
pramodk
added a commit
to BlueBrain/nmodl
that referenced
this pull request
Mar 5, 2021
- Currently catch2 is header directly added in the project - Before switching to submodule (in separate PR), copying minimal fix from the upstream: catchorg/Catch2#1971 - Update INSTALL.md for Apple M1 Fixes #527
pramodk
added a commit
to BlueBrain/nmodl
that referenced
this pull request
Mar 7, 2021
* Currently catch2 is header directly added in the project - Before switching to submodule (in separate PR), copying minimal fix from the upstream: catchorg/Catch2#1971 * Update INSTALL.md for Apple M1 fixes #527
This was referenced Jan 30, 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.
These changes resolve compilation issues for the Catch headers when compiling with macOS on ARM, which is not x86/x86_64 based. The changes are similar to the "elif defined(CATCH_PLATFORM_IPHONE)" logic later in these files. ARM based macOS machines were already announced at Apple's WWDC.
The error being resolved looks like the following: