From d478ad00d03a8c6f68e7b02a1eef2d66bbd4ab71 Mon Sep 17 00:00:00 2001
From: Prateek Machiraju <prateek.machiraju@gmail.com>
Date: Thu, 26 Nov 2020 22:28:24 -0500
Subject: [PATCH] [imgui] Allow usage of imgui_stdlib (#2889)

This bumps the version number of thirdparty-imgui in Gradle and adds
imgui_stdlib.cpp into the sources in CMake, as well as adding a new
include directory.
---
 imgui/CMakeLists.txt | 4 ++--
 shared/config.gradle | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/imgui/CMakeLists.txt b/imgui/CMakeLists.txt
index bf817025ac..afb96eac74 100644
--- a/imgui/CMakeLists.txt
+++ b/imgui/CMakeLists.txt
@@ -51,7 +51,7 @@ add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/gl3w-src
                  EXCLUDE_FROM_ALL)
 
 set(imgui_srcdir ${CMAKE_CURRENT_BINARY_DIR}/imgui-src)
-file(GLOB imgui_sources ${imgui_srcdir}/*.cpp)
+file(GLOB imgui_sources ${imgui_srcdir}/*.cpp ${imgui_srcdir}/misc/cpp/*.cpp)
 set(implot_srcdir ${CMAKE_CURRENT_BINARY_DIR}/implot-src)
 file(GLOB implot_sources ${implot_srcdir}/*.cpp)
 add_library(imgui STATIC ${imgui_sources} ${implot_sources} ${imgui_srcdir}/examples/imgui_impl_glfw.cpp ${imgui_srcdir}/examples/imgui_impl_opengl3.cpp ${CMAKE_CURRENT_BINARY_DIR}/imgui_ProggyDotted.cpp ${CMAKE_CURRENT_BINARY_DIR}/stb_image.cpp)
@@ -68,7 +68,7 @@ else()
     endif()
 endif()
 target_link_libraries(imgui PUBLIC gl3w glfw)
-target_include_directories(imgui PUBLIC "$<BUILD_INTERFACE:${imgui_srcdir}>" "$<BUILD_INTERFACE:${implot_srcdir}>" "$<BUILD_INTERFACE:${imgui_srcdir}/examples>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/stb-src>")
+target_include_directories(imgui PUBLIC "$<BUILD_INTERFACE:${imgui_srcdir}>" "$<BUILD_INTERFACE:${imgui_srcdir}/misc/cpp>" "$<BUILD_INTERFACE:${implot_srcdir}>" "$<BUILD_INTERFACE:${imgui_srcdir}/examples>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/stb-src>")
 
 set_property(TARGET imgui PROPERTY POSITION_INDEPENDENT_CODE ON)
 target_compile_features(imgui PUBLIC cxx_std_17)
diff --git a/shared/config.gradle b/shared/config.gradle
index 0f8b8a9a54..194bde4525 100644
--- a/shared/config.gradle
+++ b/shared/config.gradle
@@ -11,7 +11,7 @@ nativeUtils {
       niLibVersion = "2020.10.1"
       opencvVersion = "3.4.7-5"
       googleTestVersion = "1.9.0-5-437e100-1"
-      imguiVersion = "1.76-9"
+      imguiVersion = "1.76-10"
       wpimathVersion = "-1"
     }
   }