From 834c2cc60a0f239c42e3b3b6e182654e4ecec9bb Mon Sep 17 00:00:00 2001 From: Pascal Thomet Date: Wed, 27 Sep 2023 13:21:41 +0200 Subject: [PATCH] Add imgui_test_engine as a submodule --- .gitmodules | 3 +++ CMakeLists.txt | 3 ++- external/imgui_test_engine | 1 + src/hello_imgui_test_engine_integration/todo_test.md | 2 -- 4 files changed, 6 insertions(+), 3 deletions(-) create mode 160000 external/imgui_test_engine diff --git a/.gitmodules b/.gitmodules index 83342501..1f2ca654 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "external/ios-cmake"] path = hello_imgui_cmake/ios-cmake url = https://github.com/leetal/ios-cmake.git +[submodule "external/imgui_test_engine"] + path = external/imgui_test_engine + url = https://github.com/ocornut/imgui_test_engine.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 437e91b5..76fa482c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,7 +93,8 @@ endif() # Options / ImGui Test Engine #------------------------------------------------------------------------------ option(HELLOIMGUI_WITH_TEST_ENGINE "Provide ImGui Test engine" OFF) -set(IMGUI_TEST_ENGINE_BASEPATH ${CMAKE_CURRENT_LIST_DIR}/../imgui_test_engine CACHE STRING "path to imgui_test_engine") +# By default we use imgui_test_engine from the submodule at external/imgui_test_engine/ +set(IMGUI_TEST_ENGINE_BASEPATH ${CMAKE_CURRENT_LIST_DIR}/external/imgui_test_engine CACHE STRING "path to imgui_test_engine") #------------------------------------------------------------------------------ # Esmcripten build options diff --git a/external/imgui_test_engine b/external/imgui_test_engine new file mode 160000 index 00000000..af32f4c7 --- /dev/null +++ b/external/imgui_test_engine @@ -0,0 +1 @@ +Subproject commit af32f4c7bc1e1b9c5768c1a3a6d6df8ac319800a diff --git a/src/hello_imgui_test_engine_integration/todo_test.md b/src/hello_imgui_test_engine_integration/todo_test.md index 86fbd018..3e644c3b 100644 --- a/src/hello_imgui_test_engine_integration/todo_test.md +++ b/src/hello_imgui_test_engine_integration/todo_test.md @@ -1,5 +1,3 @@ -submodule test_engine or not ? (warning; includes implot) / 9.8M (sur 126M) - check uses of HELLOIMGUI_WITH_TEST_ENGINE vs IMGUI_ENABLE_TEST_ENGINE Config: