From 2cd13d6b5b8b41421f561fb40779eb570f417a6f Mon Sep 17 00:00:00 2001 From: Sean Middleditch Date: Sat, 12 Feb 2022 14:19:41 -0800 Subject: [PATCH 1/2] Update imgui to 1.87-WIP We don't update all the way to 1.87 due to a bug with mouse input, the SDL backend, and the docking branch: https://github.com/ocornut/imgui/issues/5012 --- depends.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depends.cmake b/depends.cmake index a4fe63b64..e1c16c0e1 100644 --- a/depends.cmake +++ b/depends.cmake @@ -18,7 +18,7 @@ up_require(catch2 ) up_require(imgui GIT_REPOSITORY git://github.com/ocornut/imgui.git - GIT_COMMIT bac748fa95ac003c7b354139980f8b4b7f6ac5da + GIT_COMMIT 0647ba3badb9db94cb2dbc971cfc034e1c72f48a CMAKE_FILE imgui.cmake ) up_require(glm From ea5164d47155fa8e05d09875ea0c3237d0bec991 Mon Sep 17 00:00:00 2001 From: Sean Middleditch Date: Sat, 12 Feb 2022 14:34:29 -0800 Subject: [PATCH 2/2] Silence a (hopefull) false warning in GCC for imgui sdl backend --- external/imgui.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/external/imgui.cmake b/external/imgui.cmake index 83cf8020a..658b504e7 100644 --- a/external/imgui.cmake +++ b/external/imgui.cmake @@ -33,3 +33,7 @@ target_sources(imgui_backend_sdl INTERFACE "${imgui_SOURCE_DIR}/backends/imgui_impl_sdl.cpp" "${imgui_SOURCE_DIR}/backends/imgui_impl_sdl.h" ) +# bug in 1.87 WIP - remove when it's fixed +target_compile_options(imgui_backend_sdl INTERFACE + $<$:-Wno-error=array-bounds> +)