Add a check for re2c version #2347
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
jhasse
requested changes
Oct 21, 2023
CMakeLists.txt
Outdated
| endif() | ||
| endif() | ||
|
|
||
| if(RE2C_PROPER) |
There was a problem hiding this comment.
drop RE2C_PROPER and use RE2C AND ${RE2C_MAJOR_VERSION} GREATER 1 here?
CMakeLists.txt
Outdated
| @@ -69,7 +78,7 @@ if(RE2C) | |||
| re2c(${PROJECT_SOURCE_DIR}/src/lexer.in.cc ${PROJECT_BINARY_DIR}/lexer.cc) | |||
| add_library(libninja-re2c OBJECT ${PROJECT_BINARY_DIR}/depfile_parser.cc ${PROJECT_BINARY_DIR}/lexer.cc) | |||
| else() | |||
| message(WARNING "re2c was not found; changes to src/*.in.cc will not affect your build.") | |||
| message(WARNING "re2c was not found/used; changes to src/*.in.cc will not affect your build.") | |||
There was a problem hiding this comment.
re2c <our version number> or later was not found; changes to src/*.in.cc will not affect your build.
| find_program(RE2C re2c) | ||
| if(RE2C) | ||
| execute_process(COMMAND "${RE2C}" --vernum OUTPUT_VARIABLE RE2C_RAW_VERSION) | ||
| math(EXPR RE2C_MAJOR_VERSION "${RE2C_RAW_VERSION} / 10000") |
There was a problem hiding this comment.
To obtain the version number, use re2c --vernum, for example:
Ubuntu:~$ re2c --vernum
030000
Then divide the number by 10000 to calculate the major version.
added 2 commits
October 23, 2023 10:23
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.
As an improved version of #2346.
In some systems, the provided version of re2c is too low to build the latest release, so an option needs to be provided. For example, on CentOS7, the re2c version is re2c 0.14.3.