update imgui to be the same as latest tomato

This commit is contained in:
Green Sky 2024-04-18 11:48:31 +02:00
parent 6968d4403e
commit 4e4b35703f
No known key found for this signature in database

View File

@ -2,33 +2,6 @@ cmake_minimum_required(VERSION 3.24 FATAL_ERROR)
include(FetchContent) include(FetchContent)
#if (NOT TARGET solanaceae_util)
#FetchContent_Declare(solanaceae_util
#GIT_REPOSITORY https://github.com/Green-Sky/solanaceae_util.git
#GIT_TAG master
#EXCLUDE_FROM_ALL
#)
#FetchContent_MakeAvailable(solanaceae_util)
#endif()
#if (NOT TARGET solanaceae_contact)
#FetchContent_Declare(solanaceae_contact
#GIT_REPOSITORY https://github.com/Green-Sky/solanaceae_contact.git
#GIT_TAG master
#EXCLUDE_FROM_ALL
#)
#FetchContent_MakeAvailable(solanaceae_contact)
#endif()
#if (NOT TARGET solanaceae_message3)
#FetchContent_Declare(solanaceae_message3
#GIT_REPOSITORY https://github.com/Green-Sky/solanaceae_message3.git
#GIT_TAG master
#EXCLUDE_FROM_ALL
#)
#FetchContent_MakeAvailable(solanaceae_message3)
#endif()
if (NOT TARGET solanaceae_plugin) if (NOT TARGET solanaceae_plugin)
FetchContent_Declare(solanaceae_plugin FetchContent_Declare(solanaceae_plugin
GIT_REPOSITORY https://github.com/Green-Sky/solanaceae_plugin.git GIT_REPOSITORY https://github.com/Green-Sky/solanaceae_plugin.git
@ -38,18 +11,6 @@ if (NOT TARGET solanaceae_plugin)
FetchContent_MakeAvailable(solanaceae_plugin) FetchContent_MakeAvailable(solanaceae_plugin)
endif() endif()
#if (NOT TARGET oatpp)
#set(OATPP_INSTALL OFF CACHE BOOL "" FORCE)
#set(OATPP_BUILD_TESTS OFF CACHE BOOL "" FORCE)
#set(OATPP_LINK_TEST_LIBRARY OFF CACHE BOOL "" FORCE)
#FetchContent_Declare(oatpp
#GIT_REPOSITORY https://github.com/oatpp/oatpp.git
#GIT_TAG master
#EXCLUDE_FROM_ALL
#)
#FetchContent_MakeAvailable(oatpp)
#endif()
if (NOT TARGET PureDOOM) if (NOT TARGET PureDOOM)
add_subdirectory(./pure_doom) add_subdirectory(./pure_doom)
endif() endif()
@ -57,7 +18,8 @@ endif()
if (NOT TARGET imgui) if (NOT TARGET imgui)
FetchContent_Declare(imgui FetchContent_Declare(imgui
GIT_REPOSITORY https://github.com/ocornut/imgui.git GIT_REPOSITORY https://github.com/ocornut/imgui.git
GIT_TAG d6cb3c9 # v1.90.1 #GIT_TAG d6cb3c9 # v1.90.1
GIT_TAG b475309fa1e # tomato at ~v0.2
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
) )