From 6cbd247cb0ffc0d95af42297b9d495b2670712e3 Mon Sep 17 00:00:00 2001 From: Philipp Storz Date: Tue, 22 Jan 2019 09:21:22 +0100 Subject: [PATCH] fix webui version problem --- webui/cmake/BareosExtractVersionInfo.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webui/cmake/BareosExtractVersionInfo.cmake b/webui/cmake/BareosExtractVersionInfo.cmake index 34144eee6a5..09ca3072539 100644 --- a/webui/cmake/BareosExtractVersionInfo.cmake +++ b/webui/cmake/BareosExtractVersionInfo.cmake @@ -23,13 +23,13 @@ IF (NOT DEFINED VERSION_STRING) file(STRINGS ${PROJECT_SOURCE_DIR}/../core/src/include/version.h VERSION_STRINGS REGEX define.*VERSION.*) list(GET VERSION_STRINGS 0 VERSION_STRING) # VERSION_STRING now is something like #define VERSION "18.2.4rc2" + string(REGEX MATCH \".*\" BAREOS_FULL_VERSION ${VERSION_STRING}) ELSE() set(BAREOS_FULL_VERSION ${VERSION_STRING}) ENDIF() string(REGEX MATCH [0-9.]+ BAREOS_NUMERIC_VERSION ${VERSION_STRING}) string(REGEX MATCH [0-9]+ SOVERSION ${VERSION_STRING}) -string(REGEX MATCH \".*\" BAREOS_FULL_VERSION ${VERSION_STRING}) string(REPLACE "\"" "" BAREOS_FULL_VERSION ${BAREOS_FULL_VERSION}) MESSAGE("BareosExtractVersionInfo: BAREOS_FULL_VERSION is " ${BAREOS_FULL_VERSION})