Fix cmake's version string handling (change proposed by Jonathan Perkin).

Before this, a text suffix (like "-rc") after the numeric version was needed.

Fix cmake's version string handling (change proposed by Jonathan Perkin).
Before this, a text suffix (like "-rc") after the numeric version was needed.
e032ebd3 · Joerg Bruehe · 3202c98c · e032ebd3
Commit e032ebd3 authored Nov 02, 2010 by Joerg Bruehe
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

cmake/mysql_version.cmake cmake/mysql_version.cmake +3 -0

No files found.
--- 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()