cmake: fix empty BAREOS_FULL_VERSION problem

Also emit fatal error if variable is empty
bareos · Jan 22, 2019 · 894a0e5 · 894a0e5
1 parent f825bdc
commit 894a0e5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/core/cmake/BareosExtractVersionInfo.cmake b/core/cmake/BareosExtractVersionInfo.cmake
@@ -35,7 +35,7 @@ MESSAGE("BAREOS_NUMERIC_VERSION is ${BAREOS_NUMERIC_VERSION}")
 MESSAGE("BAREOS_FULL_VERSION is ${BAREOS_FULL_VERSION}")
 MESSAGE("SOVERSION is ${SOVERSION}")
 
-IF (NOT BAREOS_FULL_VERSION)
+IF (BAREOS_FULL_VERSION STREQUAL "")
   MESSAGE(FATAL_ERROR BAREOS_FULL_VERSION is not set)
 ENDIF()
 

diff --git a/webui/CMakeLists.txt b/webui/CMakeLists.txt
@@ -30,8 +30,12 @@ IF (NOT DEFINED VERSION_STRING)
   INCLUDE(BareosExtractVersionInfo)
 ELSE()
   # we got VERSION_STRING from cmake commandline
+  set(BAREOS_FULL_VERSION ${VERSION_STRING})
 ENDIF()
 
+IF (BAREOS_FULL_VERSION STREQUAL "")
+  MESSAGE(FATAL_ERROR BAREOS_FULL_VERSION is not set)
+ENDIF()
 
 find_program(PHP php)
 

diff --git a/webui/cmake/BareosExtractVersionInfo.cmake b/webui/cmake/BareosExtractVersionInfo.cmake
@@ -23,10 +23,14 @@ 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})
+