diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2010-11-02 19:52:56 +0100 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2010-11-02 19:52:56 +0100 |
| commit | 6f01f9c5acde003554af93f8f33c85198ab0813d (patch) | |
| tree | 63402a2fcda95921a7a63878b33da5c047015899 /cmake/mysql_version.cmake | |
| parent | 9678beb630abaea8b935bf331fefd3594eb6a66c (diff) | |
| download | mariadb-git-6f01f9c5acde003554af93f8f33c85198ab0813d.tar.gz | |
Fix cmake's version string handling (change proposed by Jonathan Perkin).
Before this, a text suffix (like "-rc") after the numeric version was needed.
Diffstat (limited to 'cmake/mysql_version.cmake')
| -rw-r--r-- | cmake/mysql_version.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake index 6adca2ccc2f..886d7b9e8a9 100644 --- a/cmake/mysql_version.cmake +++ b/cmake/mysql_version.cmake @@ -42,6 +42,9 @@ MACRO(GET_MYSQL_VERSION) IF(NOT VERSION_STRING) FILE(STRINGS configure.in str REGEX "AC_INIT\\(") STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+[-][a-zAZ0-9]+" VERSION_STRING "${str}") + IF(NOT VERSION_STRING) + STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" VERSION_STRING "${str}") + ENDIF() ENDIF() ENDIF() ENDIF() |