Skip to content

Commit

Permalink
[imgui] Add supports for features dx*-binding and metal-binding and o…
Browse files Browse the repository at this point in the history
…sx-binding (#24999)

* [imgui] Add supports for features dx-binding and metal-binding and metal-binding

* x-add-version

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
  • Loading branch information
LilyWangLL and Lily Wang authored May 31, 2022
1 parent c34f577 commit 49cfe5e
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 11 deletions.
4 changes: 0 additions & 4 deletions ports/imgui/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ endif()
file(COPY "${CMAKE_CURRENT_LIST_DIR}/imgui-config.cmake.in" DESTINATION "${SOURCE_PATH}")
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")

if(("metal-binding" IN_LIST FEATURES OR "osx-binding" IN_LIST FEATURES) AND (NOT VCPKG_TARGET_IS_OSX))
message(FATAL_ERROR "Feature metal-binding and osx-binding are only supported on osx.")
endif()

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
allegro5-binding IMGUI_BUILD_ALLEGRO5_BINDING
Expand Down
19 changes: 13 additions & 6 deletions ports/imgui/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "imgui",
"version": "1.87",
"port-version": 1,
"description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.",
"homepage": "https://github.com/ocornut/imgui",
"license": "MIT",
Expand All @@ -25,16 +26,20 @@
"description": "Build with docking support"
},
"dx10-binding": {
"description": "Make available DirectX10 binding"
"description": "Make available DirectX10 binding",
"supports": "windows & !uwp"
},
"dx11-binding": {
"description": "Make available DirectX11 binding"
"description": "Make available DirectX11 binding",
"supports": "windows & !uwp"
},
"dx12-binding": {
"description": "Make available DirectX12 binding"
"description": "Make available DirectX12 binding",
"supports": "!x86 & windows & !uwp"
},
"dx9-binding": {
"description": "Make available DirectX9 binding"
"description": "Make available DirectX9 binding",
"supports": "windows & !uwp"
},
"freetype": {
"description": "Build font atlases using FreeType instead of stb_truetype",
Expand All @@ -58,7 +63,8 @@
"description": "Install the libigl-imgui headers"
},
"metal-binding": {
"description": "Make available Metal binding"
"description": "Make available Metal binding",
"supports": "osx"
},
"opengl2-binding": {
"description": "Make available OpenGL (legacy) binding"
Expand All @@ -67,7 +73,8 @@
"description": "Make available OpenGL3/ES/ES2 (modern) binding"
},
"osx-binding": {
"description": "Make available OSX binding"
"description": "Make available OSX binding",
"supports": "osx"
},
"sdl2-binding": {
"description": "Make available SDL2 binding",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2934,7 +2934,7 @@
},
"imgui": {
"baseline": "1.87",
"port-version": 0
"port-version": 1
},
"imgui-sfml": {
"baseline": "2.5",
Expand Down
5 changes: 5 additions & 0 deletions versions/i-/imgui.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "647accc743e0af0547fbf8671c170038e202fd1e",
"version": "1.87",
"port-version": 1
},
{
"git-tree": "b9a40068f3905099cc5cb247f1b488d0e27dfd7f",
"version": "1.87",
Expand Down

0 comments on commit 49cfe5e

Please sign in to comment.