Merge pull request #317 from bareos-testing/dev/arogge/bareos-18.2/al…

…low-tilde-versions Allow versions to contain a tilde (18.2)
bareos · Nov 5, 2019 · f05bf6c · f05bf6c
2 parents 1699ec9 + b274a24
commit f05bf6c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/cmake/BareosExtractVersionInfo.cmake b/core/cmake/BareosExtractVersionInfo.cmake
@@ -25,7 +25,7 @@ IF (NOT DEFINED VERSION_STRING)
   string(REGEX MATCH \".*\" BAREOS_FULL_VERSION ${VERSION_STRING})
   string(REPLACE "\"" "" BAREOS_FULL_VERSION ${BAREOS_FULL_VERSION})
 ELSE()
-  string(REGEX MATCH [0-9.a-zA-Z]+ BAREOS_FULL_VERSION ${VERSION_STRING})
+  string(REGEX MATCH [0-9.a-zA-Z~]+ BAREOS_FULL_VERSION ${VERSION_STRING})
 ENDIF()
 
 string(REGEX MATCH [0-9]+.[0-9]+.[0-9]+  BAREOS_NUMERIC_VERSION ${VERSION_STRING})

diff --git a/webui/cmake/BareosExtractVersionInfo.cmake b/webui/cmake/BareosExtractVersionInfo.cmake
@@ -25,7 +25,7 @@ IF (NOT DEFINED VERSION_STRING)
   # VERSION_STRING now is something like #define VERSION "18.2.4rc2"
   string(REGEX MATCH \".*\" BAREOS_FULL_VERSION ${VERSION_STRING})
 ELSE()
-  string(REGEX MATCH [0-9.a-zA-Z]+ BAREOS_FULL_VERSION ${VERSION_STRING})
+  string(REGEX MATCH [0-9.a-zA-Z~]+ BAREOS_FULL_VERSION ${VERSION_STRING})
 ENDIF()
 
 string(REGEX MATCH [0-9]+.[0-9]+.[0-9]+  BAREOS_NUMERIC_VERSION ${VERSION_STRING})