diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-12-16 15:34:11 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-12-16 15:34:11 +0100 |
| commit | 07bfd2617db894f9a6a4ad5998941d3517974bb7 (patch) | |
| tree | 6ef380be281adedf087a0aeebda5286409211a25 /cmake/mysql_version.cmake | |
| parent | 04d1596d643cc4789c63c0c4f4598fe04564f65f (diff) | |
| parent | 5cd3dffebb2abd5778e819ac57001e0d963484d8 (diff) | |
| download | mariadb-git-07bfd2617db894f9a6a4ad5998941d3517974bb7.tar.gz | |
merge
Diffstat (limited to 'cmake/mysql_version.cmake')
| -rw-r--r-- | cmake/mysql_version.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake index 27564850107..b0a77b0bbc9 100644 --- a/cmake/mysql_version.cmake +++ b/cmake/mysql_version.cmake @@ -38,8 +38,11 @@ MACRO(GET_MYSQL_VERSION) FILE(STRINGS ${CMAKE_SOURCE_DIR}/configure.in str REGEX "AM_INIT_AUTOMAKE") 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]+" 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}") + ENDIF() ENDIF() ENDIF() ENDIF() |