changed STREQUAL to MATCHES #595
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
This changes the logic in the CMake infrastructure somewhat. STREQUAL is an exact match. MATCHES just matches a string in the full string. E.g. ... MATCHES ABC will find for "fooABCbar" and all variants where ABC is present. This may sometimes not be decired. However, in the case for compilers and systems, using matches may be the best choice to allow smaller variations of variables (coming down the road). In this change SYSTEM_PROCESSOR will now use MATCHES instead of STREQUAL. The original code could be dated back to 2015 in 1c36bf1. The same goes for the compiler specifications. Now MATCHES allows a greater variability in the compiler naming conventions. This change results in some logic changes (should be changed if not desired). For instance this change: - elseif(CMAKE_C_COMPILER_ID STREQUAL Clang AND CMAKE_C_COMPILER_VERSION VERSION_GREATER 13) + elseif(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_VERSION VERSION_GREATER 13) results in ALTIVEC=TRUE for AppleClang compilers at versions >=13. It did not previously. While MATCHES Intel will also match IntelLLVM I have added explicit IntelLLVM to make it clear the intent, this is strictly not needed due to the above. Signed-off-by: Nick Papior <[email protected]>
|
This should solve #533, but I haven't tested it yet! Would something like this be applicable? |
Indeed. Keep us informed if this is enough and I will be happy to merge. Thanks! |
KingKarp4
approved these changes
Mar 26, 2024
KingKarp4
approved these changes
Mar 26, 2024
|
Thanks! FYI, I just tried this with Intel oneAPI 2024.0.1.46, and the built succeeds, though with some warnings related to unknown arguments when building zlib-ng. Other than that, everything runs smoothly. All 1745 tests pass! :) |
|
Thanx for the updates on your own time in the future and you will find the
perfect way for your students to know what they need to be in the right
position for the first time investment goals 👣
MARCEL.
…On Wed, 03 Apr 2024, 09:30 Nick Papior, ***@***.***> wrote:
Thanks!
FYI, I just tried this with Intel oneAPI 2024.0.1.46, and the built
succeeds, though with some warnings related to unknown arguments when
building zlib-ng.
Other than that, everything runs smoothly. All 1745 tests pass! :)
—
Reply to this email directly, view it on GitHub
<#595 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/BHKQ2OML3KQ6RTPV4JTCGXLY3OV2JAVCNFSM6AAAAABE5BGCLKVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDAMZTG43DCOJXGY>
.
You are receiving this because you commented.Message ID:
***@***.***>
|
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.
This changes the logic in the CMake infrastructure somewhat.
STREQUAL is an exact match.
MATCHES just matches a string in the full string.
E.g.
... MATCHES ABC
will find for "fooABCbar" and all variants where ABC is present. This may sometimes not be decired.
However, in the case for compilers and systems, using matches may be the best choice to allow smaller variations of variables (coming down the road).
In this change SYSTEM_PROCESSOR will now use MATCHES instead of STREQUAL.
The original code could be dated back to 2015 in
1c36bf1.
The same goes for the compiler specifications.
Now MATCHES allows a greater variability in the
compiler naming conventions. This change results
in some logic changes (should be changed if not
desired).
For instance this change:
results in ALTIVEC=TRUE for AppleClang compilers at versions >=13. It did not previously.
While MATCHES Intel will also match IntelLLVM I have added explicit IntelLLVM to make it clear the
intent, this is strictly not needed due to the
above.