From 484141adf411507c5098bb5cdb354ad2af185ac8 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 31 Jan 2025 18:37:31 +0100 Subject: [PATCH] [imgui] Use lunasvg config --- ports/imgui/CMakeLists.txt | 4 ++-- ports/imgui/imgui-config.cmake.in | 2 +- ports/imgui/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/i-/imgui.json | 5 +++++ 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt index 68a5c40c705caa..c64bae8dd1f608 100644 --- a/ports/imgui/CMakeLists.txt +++ b/ports/imgui/CMakeLists.txt @@ -117,8 +117,8 @@ if(IMGUI_FREETYPE) endif() if(IMGUI_FREETYPE_LUNASVG) - find_package(unofficial-lunasvg CONFIG REQUIRED) - target_link_libraries(${PROJECT_NAME} PUBLIC unofficial::lunasvg::lunasvg) + find_package(lunasvg CONFIG REQUIRED) + target_link_libraries(${PROJECT_NAME} PUBLIC lunasvg::lunasvg) target_compile_definitions(${PROJECT_NAME} PUBLIC IMGUI_ENABLE_FREETYPE_LUNASVG) endif() diff --git a/ports/imgui/imgui-config.cmake.in b/ports/imgui/imgui-config.cmake.in index a996b04c00b06b..55065183d7b402 100644 --- a/ports/imgui/imgui-config.cmake.in +++ b/ports/imgui/imgui-config.cmake.in @@ -27,7 +27,7 @@ if (@IMGUI_FREETYPE@) endif() if (@IMGUI_FREETYPE_LUNASVG@) - find_dependency(unofficial-lunasvg CONFIG) + find_dependency(lunasvg CONFIG) endif() if (@IMGUI_BUILD_ALLEGRO5_BINDING@) diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index 48652e2ed6757e..fe0d7d39e3b8d4 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,6 +1,7 @@ { "name": "imgui", "version": "1.91.7", + "port-version": 1, "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", "homepage": "https://github.com/ocornut/imgui", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 55757ca7ee0069..58fc64dc922822 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3682,7 +3682,7 @@ }, "imgui": { "baseline": "1.91.7", - "port-version": 0 + "port-version": 1 }, "imgui-node-editor": { "baseline": "0.9.3", diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index 6535e47c0b85c2..3545c3e7162aae 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a2ba4fd644c05877db6b556a9b6589b2782f8570", + "version": "1.91.7", + "port-version": 1 + }, { "git-tree": "9d76ee1246a4a6211168fdefd19a6e70e74605fc", "version": "1.91.7",