diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-06 17:13:42 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-06 17:13:42 +0100 |
| commit | be65bc99170c3865922f9ad0199e9ff0903e6242 (patch) | |
| tree | ccd7ed37b88de38a47462ff2a6c95aec6ad8bc08 /cmake | |
| parent | da0b03a9db77efa7d53555bd871d8f80d16a1fa9 (diff) | |
| parent | 19df110369d4cef5303176a8aedca34cd0e2d271 (diff) | |
| download | mariadb-git-be65bc99170c3865922f9ad0199e9ff0903e6242.tar.gz | |
merge
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/mysql_version.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake index e367da651e9..d9f6b777536 100644 --- a/cmake/mysql_version.cmake +++ b/cmake/mysql_version.cmake @@ -41,12 +41,13 @@ MACRO(GET_MYSQL_VERSION) STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" VERSION_STRING "${str}") IF(NOT VERSION_STRING) FILE(STRINGS configure.in str REGEX "AC_INIT\\(") - STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+[-][^ \\]]+" VERSION_STRING "${str}") + STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+[-][a-zAZ0-9]+" VERSION_STRING "${str}") ENDIF() ENDIF() ENDIF() ENDIF() + IF(NOT VERSION_STRING) MESSAGE(FATAL_ERROR "VERSION_STRING cannot be parsed, please specify -DVERSION_STRING=major.minor.patch-extra" |