Skip to content

[Imgui] Update docking-experimental and freetype features to 1.81 #16268

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

Merged
strega-nil merged 6 commits into from
Mar 1, 2021
Merged

[Imgui] Update docking-experimental and freetype features to 1.81 #16268

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1790adc
[imgui] Update docking-experimental and freetype features to 1.81
Feb 17, 2021
5145cfc
[imgui] Update version files
Feb 17, 2021
4bdab1c
[imgui] Move string replacement to post-build
ras0219-msft Feb 19, 2021
102d86b
Update ports/imgui/CMakeLists.txt
JackBoosY Feb 20, 2021
b86d129
[imgui] Declare IMGUI_ENABLE_FREETYPE macro only if the freetype feat…
Feb 20, 2021
1527266
[imgui] Update version files
Feb 20, 2021
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
3 changes: 3 additions & 0 deletions ports/imgui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@ if(IMGUI_FREETYPE)
find_package(freetype CONFIG REQUIRED)
target_link_libraries(${PROJECT_NAME} PUBLIC freetype)
target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/misc/freetype/imgui_freetype.cpp)
FILE(READ ${CMAKE_CURRENT_SOURCE_DIR}/imconfig.h IMCONFIG)
STRING(REGEX REPLACE "//#define IMGUI_ENABLE_FREETYPE" "#define IMGUI_ENABLE_FREETYPE" IMCONFIG "${IMCONFIG}")
FILE(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/imconfig.h "${IMCONFIG}")
Comment thread
JackBoosY marked this conversation as resolved.
Outdated
endif()

list(REMOVE_DUPLICATES BINDINGS_SOURCES)
Expand Down
2 changes: 1 addition & 1 deletion ports/imgui/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: imgui
Version: 1.81
Port-Version: 1
Port-Version: 2
Homepage: https://github.com/ocornut/imgui
Description: Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.

Expand Down
4 changes: 2 additions & 2 deletions ports/imgui/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ if ("docking-experimental" IN_LIST FEATURES)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ocornut/imgui
REF 682249396f02b8c21e5ff333ab4a1969c89387ad
SHA512 95f17c14e0a8f10dfc51fd1b30894f9905433fac8f9a93b6c545a542df5eb20be68f40996080a85cba934107ce19fff91a1df1edad1a1b5a0030e8f626e1985d
REF 239d09804d17997e147f4bcfb451ead04c1d67ff
Comment thread
JackBoosY marked this conversation as resolved.
SHA512 7e93dd8c1a465b8405d32f08aa2be0c1a2bea7762384ba6a16848e10b10f5684f8969b672cec6e994a90fc6a6189519730dd7d15b82ae39b5221278eae23ba61
HEAD_REF docking
)
else()
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2530,7 +2530,7 @@
},
"imgui": {
"baseline": "1.81",
"port-version": 1
"port-version": 2
},
"imgui-sfml": {
"baseline": "2.1-2",
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": "726bb9e638204f203251495a6d6009cb9644f044",
"version-string": "1.81",
"port-version": 2
},
{
"git-tree": "6f5ea94c84f8e4d7883a613421ef285960ce7482",
"version-string": "1.81",
Expand Down