MDEV-26579 fixup

MariaDB · Sep 10, 2021 · f68c6cc · f68c6cc
1 parent ca4bc3e
commit f68c6cc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake
@@ -50,13 +50,15 @@ MACRO(GET_MYSQL_VERSION)
   MYSQL_GET_CONFIG_VALUE("MYSQL_VERSION_EXTRA" EXTRA_VERSION)
   MYSQL_GET_CONFIG_VALUE("SERVER_MATURITY" SERVER_MATURITY)
 
-IF(NOT "${MAJOR_VERSION}" MATCHES "[0-9]+" OR
+  IF(NOT "${MAJOR_VERSION}" MATCHES "[0-9]+" OR
    NOT "${MINOR_VERSION}" MATCHES "[0-9]+" OR
    NOT "${PATCH_VERSION}" MATCHES "[0-9]+")
     MESSAGE(FATAL_ERROR "VERSION file cannot be parsed.")
   ENDIF()
   IF((NOT TINY_VERSION) AND (EXTRA_VERSION MATCHES "[\\-][0-9]+"))
     STRING(REPLACE "-" "" TINY_VERSION "${EXTRA_VERSION}")
+  ELSE()
+    SET(TINY_VERSION "0")
   ENDIF()
   SET(VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EXTRA_VERSION}")
   SET(SERVER_VERSION ${VERSION})
@@ -121,10 +123,6 @@ ENDIF()
 IF(MSVC)
     # Tiny version is used to identify the build, it can be set with cmake -DTINY_VERSION=<number>
     # to bzr revno for example (in the CI builds)
-    IF(NOT TINY_VERSION)
-      SET(TINY_VERSION "0")
-    ENDIF()
-
     GET_FILENAME_COMPONENT(MYSQL_CMAKE_SCRIPT_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
 
     SET(FILETYPE VFT_APP)

diff --git a/win/packaging/create_msi.cmake b/win/packaging/create_msi.cmake
@@ -240,8 +240,8 @@ FUNCTION(TRAVERSE_FILES dir topdir file file_comp  dir_root)
 
   SET(NONEXEFILES)
   FOREACH(v MAJOR_VERSION MINOR_VERSION PATCH_VERSION TINY_VERSION)
-    IF(NOT ${v})
-      MESSAGE(FATAL_ERROR "${v} is not set")
+    IF(NOT DEFINED ${v})
+      MESSAGE(FATAL_ERROR "${v} is not defined")
     ENDIF()
   ENDFOREACH()
   SET(default_version "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}.${TINY_VERSION}")