Upgrade TBB and ANTLR #1714
Merged
Upgrade TBB and ANTLR #1714
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
Co-authored-by: Spitz <noella.spitz@ndw2544mac.isis.cclrc.ac.uk>
rhinoella
changed the title
trisyoungs
requested changes
Dec 8, 2023
Merged
trisyoungs
approved these changes
Dec 13, 2023
Comment on lines
+45
to
+46
| cp ./deploy/antlr4-cppruntime/lib/libantlr4-runtime.*.dylib /usr/local/lib | ||
| cp ./deploy/antlr4-cppruntime/lib/libantlr4-runtime.dylib /usr/local/lib/libantlr4-runtime.dylib |
As a side effect, we lose weggli, but even I wasn't using it
rprospero
added a commit
that referenced
this pull request
Mar 11, 2024
Co-authored-by: Spitz <noella.spitz@ndw2544mac.isis.cclrc.ac.uk> Co-authored-by: Adam Washington <adam.washington@stfc.ac.uk>
rprospero
added a commit
that referenced
this pull request
Apr 8, 2024
Co-authored-by: Spitz <noella.spitz@ndw2544mac.isis.cclrc.ac.uk> Co-authored-by: Adam Washington <adam.washington@stfc.ac.uk>
rprospero
added a commit
that referenced
this pull request
Apr 9, 2024
Co-authored-by: Spitz <noella.spitz@ndw2544mac.isis.cclrc.ac.uk> Co-authored-by: Adam Washington <adam.washington@stfc.ac.uk>
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.
Change from the depreciated TBB (2020.3) to the new oneAPI version (2021.10.0). as well as ANTLR from version 4.9.3 to 4.13.1. Would allow for Dissolve to work on Apple Sillicon.
Note:
Due to naming conflicts
QT_NO_KEYWORDSwas set meaning we can't use the QT generated MOC keywords anymore such asslotsoremit. These now have to be replaced withQ_SLOTSandQ_EMIT, respectively.Closes #1712