From 3cd89eeffbf69a09aa1ee44b76a890f7ffce845a Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Wed, 17 May 2023 21:24:14 -0400 Subject: [PATCH] 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 --- cmake/CreateGitVersionHeader.cmake | 3 +++ libs/kiplatform/msw/ui.cpp | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake/CreateGitVersionHeader.cmake b/cmake/CreateGitVersionHeader.cmake index 124e5ecf2d..f0cf697765 100644 --- a/cmake/CreateGitVersionHeader.cmake +++ b/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 ) diff --git a/libs/kiplatform/msw/ui.cpp b/libs/kiplatform/msw/ui.cpp index 7768d7b090..2cb255c368 100644 --- a/libs/kiplatform/msw/ui.cpp +++ b/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 ); } } \ No newline at end of file