Update imgui to 1.87-WIP (#325)

* 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: ocornut/imgui#5012 * Silence a (hopefull) false warning in GCC for imgui sdl backend
potatoengine · Feb 13, 2022 · 3f1b2b7 · 3f1b2b7
1 parent 9d26582
commit 3f1b2b7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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

diff --git 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
+    $<$<CXX_COMPILER_ID:GNU>:-Wno-error=array-bounds>
+)