Harden cmake regexes when looking for #define strings. #13401
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
tamiko
reviewed
Feb 16, 2022
cmake/modules/FindADOLC.cmake
Outdated
| @@ -57,7 +57,7 @@ IF(EXISTS ${ADOLC_SETTINGS_H}) | |||
| # Check whether ADOL-C is configured with extra trig functions | |||
| # | |||
| FILE(STRINGS "${ADOLC_SETTINGS_H}" ADOLC_ATRIG_ERF_STRING | |||
| REGEX "#define ATRIG_ERF" | |||
| REGEX "^[ \t]*#[ \t]*define ATRIG_ERF" | |||
There was a problem hiding this comment.
While at it, would it make sense to change the single space between define and the macro by something like
[ \t]\+ as well?
There was a problem hiding this comment.
Yes, makes sense. So done!
bangerth
force-pushed
the
cmake-regex
branch
from
5e5226e
to
2d2a913
Compare
|
Seems to work now! |
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.
Following-up on the comment at #13374 (comment) . Specifically,
#definelines don't have to look likebut can be
Make sure we find these as well.
I don't think it matters at the moment given that we seem to be finding all of our dependencies just fine. But they might change their style at some future point, and this makes us future proof.
/rebuild