haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try and silence the ci failure on windows

This commit is contained in:
Marek Roszko 2022-01-23 14:16:02 -05:00
parent e5d5ee07f0
commit 1689ee5954
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeModules/BuildSteps/WriteVersionHeader.cmake
View File

@ -41,9 +41,9 @@ if( CMAKE_MATCH_COUNT EQUAL 2 )
set( KICAD_MINOR_VERSION "${CMAKE_MATCH_2}" ) set( KICAD_MINOR_VERSION "${CMAKE_MATCH_2}" )
if( KICAD_MINOR_VERSION STREQUAL "99" ) if( KICAD_MINOR_VERSION STREQUAL "99" )
set( KICAD_IS_NIGHTLY "1" ) set( KICAD_IS_NIGHTLY "1" )
else() else()
set( KICAD_IS_NIGHTLY "0" ) set( KICAD_IS_NIGHTLY "0" )
endif() endif()
set( KICAD_WIN32_RC_FILEVER_STR "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.0.${KICAD_GIT_REV}\\0" ) set( KICAD_WIN32_RC_FILEVER_STR "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.0.${KICAD_GIT_REV}\\0" )

11
CMakeModules/CreateGitVersionHeader.cmake
View File

@ -58,7 +58,18 @@ macro( create_git_version_header _git_src_path )
# to KiCadVersion.cmake as the revision level. # to KiCadVersion.cmake as the revision level.
if( _git_DESCRIBE ) if( _git_DESCRIBE )
set( KICAD_VERSION "(${_git_DESCRIBE})" ) set( KICAD_VERSION "(${_git_DESCRIBE})" )
endif()
if( _git_REV_COUNT )
set( KICAD_GIT_REV "${_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() endif()
endmacro() endmacro()