Of course I messed up generating the version header.

Trailing zeros, undef'd "falsy" variable. Sigh.
mosra · Jun 27, 2020 · b0f2818 · b0f2818
1 parent f65ff93
commit b0f2818
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Magnum/CMakeLists.txt b/src/Magnum/CMakeLists.txt
@@ -34,10 +34,12 @@ if(Git_FOUND)
         OUTPUT_VARIABLE MAGNUMPLUGINS_VERSION_STRING
         RESULT_VARIABLE _MAGNUMPLUGINS_VERSION_RESULT
         ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if(MAGNUMPLUGINS_VERSION_STRING MATCHES "^v([0-9][0-9][0-9][0-9])\\.0?([0-9][0-9])-([0-9]+)-g([a-f0-9]+)$")
+    if(MAGNUMPLUGINS_VERSION_STRING MATCHES "^v([0-9][0-9][0-9][0-9])\\.0?([0-9][0-9]?)-([0-9]+)-g([a-f0-9]+)$")
         set(MAGNUMPLUGINS_VERSION_YEAR ${CMAKE_MATCH_1})
         set(MAGNUMPLUGINS_VERSION_MONTH ${CMAKE_MATCH_2})
         set(MAGNUMPLUGINS_VERSION_COMMIT ${CMAKE_MATCH_3})
+        # Otherwise if commit is 0, it would #undef the variable
+        set(MAGNUMPLUGINS_VERSION_COMMIT " ${MAGNUMPLUGINS_VERSION_COMMIT}")
         set(MAGNUMPLUGINS_VERSION_HASH ${CMAKE_MATCH_4})
     elseif(_MAGNUMPLUGINS_VERSION_RESULT EQUAL 0)
         message(WARNING "Can't match Git version from ${MAGNUMPLUGINS_VERSION_STRING}")

diff --git a/src/Magnum/versionPlugins.h.cmake b/src/Magnum/versionPlugins.h.cmake
@@ -31,7 +31,7 @@
 
 #define MAGNUMPLUGINS_VERSION_YEAR ${MAGNUMPLUGINS_VERSION_YEAR}
 #define MAGNUMPLUGINS_VERSION_MONTH ${MAGNUMPLUGINS_VERSION_MONTH}
-#cmakedefine MAGNUMPLUGINS_VERSION_COMMIT ${MAGNUMPLUGINS_VERSION_COMMIT}
+#cmakedefine MAGNUMPLUGINS_VERSION_COMMIT${MAGNUMPLUGINS_VERSION_COMMIT}
 #cmakedefine MAGNUMPLUGINS_VERSION_HASH 0x${MAGNUMPLUGINS_VERSION_HASH}
 #cmakedefine MAGNUMPLUGINS_VERSION_STRING "${MAGNUMPLUGINS_VERSION_STRING}"