Skip to content

Commit 5bde8bf

Browse files
authored
Check either possibility for cmake set function (#4369)
There are two possible functions that can appear in `version_override.cmake`, so we need to make sure both are handled
1 parent a002219 commit 5bde8bf

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

ci/post/main.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
import forum
3939

4040
# Compile regexes for extracting version components
41-
MAJOR_VERSION_PATTERN = re.compile("set_if_not_defined\(FSO_VERSION_MAJOR (\d+)\)")
42-
MINOR_VERSION_PATTERN = re.compile("set_if_not_defined\(FSO_VERSION_MINOR (\d+)\)")
43-
BUILD_VERSION_PATTERN = re.compile("set_if_not_defined\(FSO_VERSION_BUILD (\d+)\)")
44-
REVISION_VERSION_PATTERN = re.compile("set_if_not_defined\(FSO_VERSION_REVISION (\d+)\)")
45-
REVISION_STR_VERSION_PATTERN = re.compile("set_if_not_defined\(FSO_VERSION_REVISION_STR (\d+)\)")
41+
MAJOR_VERSION_PATTERN = re.compile("(?:set_if_not_defined|set)\(FSO_VERSION_MAJOR (\d+)\)")
42+
MINOR_VERSION_PATTERN = re.compile("(?:set_if_not_defined|set)\(FSO_VERSION_MINOR (\d+)\)")
43+
BUILD_VERSION_PATTERN = re.compile("(?:set_if_not_defined|set)\(FSO_VERSION_BUILD (\d+)\)")
44+
REVISION_VERSION_PATTERN = re.compile("(?:set_if_not_defined|set)\(FSO_VERSION_REVISION (\d+)\)")
45+
REVISION_STR_VERSION_PATTERN = re.compile("(?:set_if_not_defined|set)\(FSO_VERSION_REVISION_STR (\d+)\)")
4646

4747
LOG_FORMAT = """
4848
------------------------------------------------------------------------%n

0 commit comments

Comments
 (0)