Fixes to use the version of imgui packaged into mutils for the demos

Author: cmaughan

demos/CMakeLists.txt

@@ -11,7 +11,6 @@ find_package(gsl-lite REQUIRED)
 find_package(SDL2 REQUIRED)
 find_package(fmt REQUIRED)
 find_package(gl3w REQUIRED)
-find_package(imgui REQUIRED)
 find_package(freetype CONFIG REQUIRED)
 find_package(unofficial-concurrentqueue REQUIRED)
 find_package(tinyfiledialogs REQUIRED)

demos/demo_imgui/main.cpp

@@ -7,11 +7,11 @@
 #include <stdio.h>
 #include <thread>
 
-#include <imgui.h>
+#include <imgui/imgui.h>
 
-#include <imgui_freetype.h>
-#include <imgui_impl_opengl3.h>
-#include <imgui_impl_sdl.h>
+#include <imgui/imgui_freetype.h>
+#include <imgui/imgui_impl_opengl3.h>
+#include <imgui/imgui_impl_sdl.h>
 
 #include <clip/clip.h>
 #include <mutils/time/time_provider.h>

extensions/CMakeLists.txt

@@ -7,7 +7,6 @@ project(ZepExtensions
 set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${CMAKE_CURRENT_LIST_DIR}/../../vcpkg/packages/mutils_${VCPKG_TARGET_TRIPLET}/lib/cmake/mutils)
 
 find_package(SDL2 REQUIRED)
-find_package(imgui REQUIRED)
 find_package(gsl-lite REQUIRED)
 find_package(SDL2 REQUIRED)
 find_package(fmt REQUIRED)

include/zep/imgui/display_imgui.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "../display.h"
 #include "../syntax.h"
-#include <imgui.h>
+#include <imgui/imgui.h>
 #include <string>
 
 // Can't include this publicly