From 34dafdd2c1ef4406e0dfd0e52fb32c2ca7acb962 Mon Sep 17 00:00:00 2001 From: Mark Roszko Date: Sun, 23 Jan 2022 19:23:43 +0000 Subject: [PATCH] Try and silence the ci failure on windows --- CMakeModules/CreateGitVersionHeader.cmake | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CMakeModules/CreateGitVersionHeader.cmake b/CMakeModules/CreateGitVersionHeader.cmake index 0c10fb61ec..51b69eda56 100644 --- a/CMakeModules/CreateGitVersionHeader.cmake +++ b/CMakeModules/CreateGitVersionHeader.cmake @@ -58,7 +58,18 @@ macro( create_git_version_header _git_src_path ) # to KiCadVersion.cmake as the revision level. if( _git_DESCRIBE ) set( KICAD_VERSION "(${_git_DESCRIBE})" ) + endif() + + if( _git_REV_COUNT ) set( KICAD_GIT_REV "${_git_REV_COUNT}" ) + + # Sanity check + if (NOT KICAD_GIT_REV MATCHES "^[0-9]+$") + set( KICAD_GIT_REV "0" ) + endif () + else() + # Incase the command failed, we can just default to 0, only a problem in CI right now + set( KICAD_GIT_REV "0" ) endif() endmacro()