diff options
| author | Ryan Volz <ryan.volz@gmail.com> | 2021-06-06 00:37:00 -0400 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-06-16 06:47:09 -0400 |
| commit | f673b25d369068d317a451ef5e6fcec02dcf897b (patch) | |
| tree | 13d91049fea194f152f50078fbb274b3da62936e /cmake | |
| parent | 0f851bd06098c3f3c9fa6ae5ebfb28b33110c0c1 (diff) | |
cmake: Ensure that RC_*_VERSION are numeric.
Non-numeric values (such as "0-rc1") cause build errors.
Signed-off-by: Ryan Volz <ryan.volz@gmail.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/GrVersion.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmake/Modules/GrVersion.cmake b/cmake/Modules/GrVersion.cmake index 6d39d8d4bf..5f3d3d371b 100644 --- a/cmake/Modules/GrVersion.cmake +++ b/cmake/Modules/GrVersion.cmake @@ -74,6 +74,7 @@ else() set(VERSION "${MAJOR_VERSION}.${API_COMPAT}.${MINOR_VERSION}.${MAINT_VERSION}") set(DOCVER "${VERSION}") set(LIBVER "${MAJOR_VERSION}.${API_COMPAT}.${MINOR_VERSION}") - set(RC_MINOR_VERSION ${MINOR_VERSION}) - set(RC_MAINT_VERSION ${MAINT_VERSION}) + # ensure only numeric values are set for RC_ version parts + string(REGEX REPLACE "^([0-9]+).*$" "\\1" RC_MINOR_VERSION ${MINOR_VERSION}) + string(REGEX REPLACE "^([0-9]+).*$" "\\1" RC_MAINT_VERSION ${MAINT_VERSION}) endif() |