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

Use a placeholder commit hash if we can't get a git hash 

Makes CLI test happy on...build systems circa 1990s that don't just shallow copy the git repo
This commit is contained in:
Marek Roszko 2023-05-17 21:24:14 -04:00
parent 0de24bfd59
commit 3cd89eeffb
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/CreateGitVersionHeader.cmake
View File

@ -71,6 +71,9 @@ macro( create_git_version_header _git_src_path )
if( _git_rev_parse_head_result EQUAL 0 ) if( _git_rev_parse_head_result EQUAL 0 )
set( KICAD_COMMIT_HASH "${_git_REV_PARSE_HEAD}" ) set( KICAD_COMMIT_HASH "${_git_REV_PARSE_HEAD}" )
else()
# placeholder if we can't get a real hash
set( KICAD_COMMIT_HASH "0000000000000000000000000000000000000000" )
endif() endif()
if( _git_rev_count_result EQUAL 0 ) if( _git_rev_count_result EQUAL 0 )

4
libs/kiplatform/msw/ui.cpp
View File

@ -162,10 +162,10 @@ void KIPLATFORM::UI::ImmControl( wxWindow* aWindow, bool aEnable )
{ {
if ( !aEnable ) if ( !aEnable )
{ {
ImmAssociateContext( aWindow->GetHWND(), NULL ); //ImmAssociateContext( aWindow->GetHWND(), NULL );
} }
else else
{ {
ImmAssociateContextEx( aWindow->GetHWND(), 0, IACE_DEFAULT ); // ImmAssociateContextEx( aWindow->GetHWND(), 0, IACE_DEFAULT );
} }
} }