File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -34,10 +34,12 @@ if(Git_FOUND)
3434 OUTPUT_VARIABLE MAGNUMPLUGINS_VERSION_STRING
3535 RESULT_VARIABLE _MAGNUMPLUGINS_VERSION_RESULT
3636 ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE )
37- 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]+)$" )
37+ 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]+)$" )
3838 set (MAGNUMPLUGINS_VERSION_YEAR ${CMAKE_MATCH_1} )
3939 set (MAGNUMPLUGINS_VERSION_MONTH ${CMAKE_MATCH_2} )
4040 set (MAGNUMPLUGINS_VERSION_COMMIT ${CMAKE_MATCH_3} )
41+ # Otherwise if commit is 0, it would #undef the variable
42+ set (MAGNUMPLUGINS_VERSION_COMMIT " ${MAGNUMPLUGINS_VERSION_COMMIT} " )
4143 set (MAGNUMPLUGINS_VERSION_HASH ${CMAKE_MATCH_4} )
4244 elseif (_MAGNUMPLUGINS_VERSION_RESULT EQUAL 0)
4345 message (WARNING "Can't match Git version from ${MAGNUMPLUGINS_VERSION_STRING} " )
Original file line number Diff line number Diff line change 3131
3232#define MAGNUMPLUGINS_VERSION_YEAR ${MAGNUMPLUGINS_VERSION_YEAR}
3333#define MAGNUMPLUGINS_VERSION_MONTH ${MAGNUMPLUGINS_VERSION_MONTH}
34- #cmakedefine MAGNUMPLUGINS_VERSION_COMMIT ${MAGNUMPLUGINS_VERSION_COMMIT}
34+ #cmakedefine MAGNUMPLUGINS_VERSION_COMMIT${MAGNUMPLUGINS_VERSION_COMMIT}
3535#cmakedefine MAGNUMPLUGINS_VERSION_HASH 0x${MAGNUMPLUGINS_VERSION_HASH}
3636#cmakedefine MAGNUMPLUGINS_VERSION_STRING "${MAGNUMPLUGINS_VERSION_STRING}"
3737
You can’t perform that action at this time.
0 commit comments