Browse Source

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
newinvert
Marek Roszko 2 years ago
parent
commit
3cd89eeffb
  1. 3
      cmake/CreateGitVersionHeader.cmake
  2. 4
      libs/kiplatform/msw/ui.cpp

3
cmake/CreateGitVersionHeader.cmake

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

4
libs/kiplatform/msw/ui.cpp

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