Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[imgui] Update to 1.89.9 #33537

Merged
merged 6 commits into from
Sep 6, 2023
Merged

[imgui] Update to 1.89.9 #33537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e21b869
[imgui] Update to 1.89.9
RT2Code Sep 4, 2023
970df9d
[imgui] Update version files
RT2Code Sep 4, 2023
0d97ade
[imgui] Add LunaSVG feature
RT2Code Sep 4, 2023
7d6648b
[imgui] Update version files
RT2Code Sep 4, 2023
28b158d
[imgui] Fix LunaSVG CMake linking
RT2Code Sep 5, 2023
02a8ed6
[imgui] Update version files
RT2Code Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ports/imgui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@ if(IMGUI_FREETYPE)
target_compile_definitions(${PROJECT_NAME} PUBLIC IMGUI_ENABLE_FREETYPE)
endif()

if(IMGUI_FREETYPE_LUNASVG)
find_package(unofficial-lunasvg CONFIG REQUIRED)
target_link_libraries(${PROJECT_NAME} PUBLIC unofficial::lunasvg::lunasvg)
target_compile_definitions(${PROJECT_NAME} PUBLIC IMGUI_ENABLE_FREETYPE_LUNASVG)
endif()

if(IMGUI_USE_WCHAR32)
target_compile_definitions(${PROJECT_NAME} PUBLIC IMGUI_USE_WCHAR32)
endif()
Expand Down
4 changes: 4 additions & 0 deletions ports/imgui/imgui-config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ if (@IMGUI_FREETYPE@)
find_dependency(freetype CONFIG)
endif()

if (@IMGUI_FREETYPE_LUNASVG@)
find_dependency(unofficial-lunasvg CONFIG)
endif()

if (@IMGUI_BUILD_ALLEGRO5_BINDING@)
find_dependency(unofficial-allegro5 CONFIG)
endif()
Expand Down
10 changes: 7 additions & 3 deletions ports/imgui/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ if ("docking-experimental" IN_LIST FEATURES)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ocornut/imgui
REF dc3e531ff28450bff73fde0163b1d076b6bb5605
SHA512 c716d90c57a036f0117eb02814c3ed164db31727f604fb7568e8413dfba73b678e09c6405a2af52e12522cb766fcf585a97a69b33097349b66755e5b9b04fd06
REF a1b60fc1f5589d498ab1080c2572da725fcbd0e3
SHA512 ac6117f6adf9418af3a2db5392f1316be50a94c38e78cd1eadc0e0a71dfbb5536507aaf4d9d3b3468b5a30ebf143b806e2774f274e2098e1217ed93080fe81c7
HEAD_REF docking
)
else()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ocornut/imgui
REF v${VERSION}
SHA512 69023cbff02287cb6409b08079d21469680222ca985fd1acd658dcf704c615cb2d74668821dc4830bef70be6033640b0528d3a103b70ebeb4b7563576305bf80
SHA512 42021b06b611b58222b09fab8db2c34e992c3dc4fbaa175e09833c66c90d04b4a4e7def16a732535335c0ac5ff014d235835511a5d9a76d32b4395b302146919
HEAD_REF master
)
endif()
Expand All @@ -39,6 +39,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
vulkan-binding IMGUI_BUILD_VULKAN_BINDING
win32-binding IMGUI_BUILD_WIN32_BINDING
freetype IMGUI_FREETYPE
freetype-lunasvg IMGUI_FREETYPE_LUNASVG
wchar32 IMGUI_USE_WCHAR32
)

Expand Down Expand Up @@ -68,6 +69,9 @@ vcpkg_cmake_install()
if ("freetype" IN_LIST FEATURES)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/imconfig.h" "//#define IMGUI_ENABLE_FREETYPE" "#define IMGUI_ENABLE_FREETYPE")
endif()
if ("freetype-lunasvg" IN_LIST FEATURES)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/imconfig.h" "//#define IMGUI_ENABLE_FREETYPE_LUNASVG" "#define IMGUI_ENABLE_FREETYPE_LUNASVG")
endif()
if ("wchar32" IN_LIST FEATURES)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/imconfig.h" "//#define IMGUI_USE_WCHAR32" "#define IMGUI_USE_WCHAR32")
endif()
Expand Down
15 changes: 13 additions & 2 deletions ports/imgui/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "imgui",
"version": "1.89.7",
"port-version": 1,
"version": "1.89.9",
"description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.",
"homepage": "https://github.com/ocornut/imgui",
"license": "MIT",
Expand Down Expand Up @@ -47,6 +46,18 @@
"freetype"
]
},
"freetype-lunasvg": {
"description": "Add support to render OpenType SVG fonts using LunaSVG",
"dependencies": [
{
"name": "imgui",
"features": [
"freetype"
]
},
"lunasvg"
]
},
"glfw-binding": {
"description": "Make available GLFW binding",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3381,8 +3381,8 @@
"port-version": 1
},
"imgui": {
"baseline": "1.89.7",
"port-version": 1
"baseline": "1.89.9",
"port-version": 0
},
"imgui-sfml": {
"baseline": "2.5",
Expand Down
5 changes: 5 additions & 0 deletions versions/i-/imgui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "37d78911bfdf98548568771acd72f7e6a88d1e58",
"version": "1.89.9",
"port-version": 0
},
{
"git-tree": "5be94cd09a52d92e1ad194fa7f29846619529be2",
"version": "1.89.7",
Expand Down