Skip to content

Commit 641957c

Browse files
committed
fix build failure when version numbers have less than 4 segments
Regression from 887c418
1 parent 04accc2 commit 641957c

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

src/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ file(STRINGS ../Extensions/ReaPack.ext REAPACK_VERSION REGEX "^@version")
4545
string(SUBSTRING ${REAPACK_VERSION} 9 -1 REAPACK_VERSION)
4646
string(REGEX REPLACE "[^0-9]+" ";" VERSION_LIST ${REAPACK_VERSION})
4747
list(TRANSFORM VERSION_LIST REPLACE "[^0-9]" "")
48+
list(APPEND VERSION_LIST 0 0 0)
4849
list(GET VERSION_LIST 0 REAPACK_VERSION_MAJOR)
4950
list(GET VERSION_LIST 1 REAPACK_VERSION_MINOR)
5051
list(GET VERSION_LIST 2 REAPACK_VERSION_PATCH)

src/buildinfo.hpp.in

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
#cmakedefine REAPACK_FILENAME "@REAPACK_FILENAME@"
2-
#cmakedefine REAPACK_BASENAME "@REAPACK_BASENAME@"
3-
#cmakedefine REAPACK_VERSION "@REAPACK_VERSION@"
4-
#cmakedefine REAPACK_REVISION "@REAPACK_REVISION@"
5-
#cmakedefine REAPACK_BUILDTIME "@REAPACK_BUILDTIME@"
6-
#cmakedefine REAPACK_COPYRIGHT "@REAPACK_COPYRIGHT@"
1+
#define REAPACK_FILENAME "@REAPACK_FILENAME@"
2+
#define REAPACK_BASENAME "@REAPACK_BASENAME@"
3+
#define REAPACK_VERSION "@REAPACK_VERSION@"
4+
#define REAPACK_REVISION "@REAPACK_REVISION@"
5+
#define REAPACK_BUILDTIME "@REAPACK_BUILDTIME@"
6+
#define REAPACK_COPYRIGHT "@REAPACK_COPYRIGHT@"
77

8-
#cmakedefine REAPACK_VERSION_MAJOR @REAPACK_VERSION_MAJOR@
9-
#cmakedefine REAPACK_VERSION_MINOR @REAPACK_VERSION_MINOR@
10-
#cmakedefine REAPACK_VERSION_PATCH @REAPACK_VERSION_PATCH@
11-
#cmakedefine REAPACK_VERSION_TWEAK @REAPACK_VERSION_TWEAK@
8+
#define REAPACK_VERSION_MAJOR @REAPACK_VERSION_MAJOR@
9+
#define REAPACK_VERSION_MINOR @REAPACK_VERSION_MINOR@
10+
#define REAPACK_VERSION_PATCH @REAPACK_VERSION_PATCH@
11+
#define REAPACK_VERSION_TWEAK @REAPACK_VERSION_TWEAK@

0 commit comments

Comments
 (0)