diff options
| author | aizuon <44760523+aizuon@users.noreply.github.com> | 2021-02-17 04:33:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-16 17:33:33 -0800 |
| commit | e2ecca095c77180ab0114600f78b557ab6c99fc2 (patch) | |
| tree | c0db1ab9da2ce99c0b4f241afcbc1059551222f1 | |
| parent | 5f29a7a5cae5374e99a488f3b324f1948de43c89 (diff) | |
| download | vcpkg-e2ecca095c77180ab0114600f78b557ab6c99fc2.tar.gz vcpkg-e2ecca095c77180ab0114600f78b557ab6c99fc2.zip | |
[imgui] change to correct dx binding implementation path (#16255)
* [imgui] change to correct dx binding implementation path
* [imgui] add version files
* [imgui] forgot to update hash
| -rw-r--r-- | ports/imgui/CMakeLists.txt | 64 | ||||
| -rw-r--r-- | ports/imgui/CONTROL | 1 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/i-/imgui.json | 5 |
4 files changed, 39 insertions, 33 deletions
diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt index f215990c4..f6f85b29e 100644 --- a/ports/imgui/CMakeLists.txt +++ b/ports/imgui/CMakeLists.txt @@ -33,87 +33,87 @@ endif() if(IMGUI_BUILD_ALLEGRO5_BINDING) find_path(ALLEGRO5_INCLUDE_DIRS allegro5/allegro.h) target_include_directories(${PROJECT_NAME} PRIVATE ${ALLEGRO5_INCLUDE_DIRS}) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_allegro5.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_allegro5.cpp) endif() if(IMGUI_BUILD_DX9_BINDING) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx9.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx9.cpp) endif() if(IMGUI_BUILD_DX10_BINDING) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx10.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx10.cpp) endif() if(IMGUI_BUILD_DX11_BINDING) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx11.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx11.cpp) endif() if(IMGUI_BUILD_DX12_BINDING) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx12.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx12.cpp) endif() if(IMGUI_BUILD_GLFW_BINDING) find_package(glfw3 CONFIG REQUIRED) target_link_libraries(${PROJECT_NAME} PUBLIC glfw) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_glfw.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_glfw.cpp) endif() if(IMGUI_BUILD_GLUT_BINDING) find_package(GLUT REQUIRED) target_link_libraries(${PROJECT_NAME} PUBLIC GLUT::GLUT) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_glut.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_glut.cpp) endif() if(IMGUI_BUILD_METAL_BINDING) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_metal.mm) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_metal.mm) endif() if(IMGUI_BUILD_OPENGL2_BINDING) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_opengl2.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl2.cpp) endif() if(IMGUI_BUILD_OPENGL3_GLEW_BINDING) find_package(GLEW REQUIRED) target_link_libraries(${PROJECT_NAME} PUBLIC GLEW::GLEW) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_opengl3.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3.cpp) endif() if(IMGUI_BUILD_OPENGL3_GLAD_BINDING) find_package(glad CONFIG REQUIRED) target_link_libraries(${PROJECT_NAME} PUBLIC glad::glad) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_opengl3.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3.cpp) endif() if(IMGUI_BUILD_OPENGL3_GL3W_BINDING) find_package(gl3w CONFIG REQUIRED) target_link_libraries(${PROJECT_NAME} PUBLIC unofficial::gl3w::gl3w) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_opengl3.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3.cpp) endif() if(IMGUI_BUILD_OPENGL3_GLBINDING_BINDING) find_package(glbinding CONFIG REQUIRED) target_link_libraries(${PROJECT_NAME} PUBLIC glbinding::glbinding) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_opengl3.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3.cpp) endif() if(IMGUI_BUILD_OSX_BINDING) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_osx.mm) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_osx.mm) endif() if(IMGUI_BUILD_SDL2_BINDING) find_package(SDL2 CONFIG REQUIRED) target_link_libraries(${PROJECT_NAME} PUBLIC SDL2::SDL2) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_sdl.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdl.cpp) endif() if(IMGUI_BUILD_VULKAN_BINDING) find_package(Vulkan REQUIRED) target_link_libraries(${PROJECT_NAME} PUBLIC Vulkan::Vulkan) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_vulkan.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_vulkan.cpp) endif() if(IMGUI_BUILD_WIN32_BINDING) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_win32.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_win32.cpp) endif() if(IMGUI_FREETYPE) @@ -155,64 +155,64 @@ if(NOT IMGUI_SKIP_HEADERS) ) if(IMGUI_BUILD_ALLEGRO5_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_allegro5.h DESTINATION include) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_allegro5.h DESTINATION include) endif() if(IMGUI_BUILD_DX9_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx9.h DESTINATION include) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx9.h DESTINATION include) endif() if(IMGUI_BUILD_DX10_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx10.h DESTINATION include) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx10.h DESTINATION include) endif() if(IMGUI_BUILD_DX11_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx11.h DESTINATION include) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx11.h DESTINATION include) endif() if(IMGUI_BUILD_DX12_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx12.h DESTINATION include) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx12.h DESTINATION include) endif() if(IMGUI_BUILD_GLFW_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_glfw.h DESTINATION include) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_glfw.h DESTINATION include) endif() if(IMGUI_BUILD_GLUT_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_glut.h DESTINATION include) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_glut.h DESTINATION include) endif() if(IMGUI_COPY_MARMALADE_BINDING) - file(GLOB MARMALADE_BINDING_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_marmalade.*) + file(GLOB MARMALADE_BINDING_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_marmalade.*) install(FILES ${MARMALADE_BINDING_SRCS} DESTINATION include/bindings) endif() if(IMGUI_BUILD_METAL_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_metal.h DESTINATION include) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_metal.h DESTINATION include) endif() if(IMGUI_BUILD_OPENGL2_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_opengl2.h DESTINATION include) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl2.h DESTINATION include) endif() if(IMGUI_BUILD_OPENGL3_GLEW_BINDING OR IMGUI_BUILD_OPENGL3_GLAD_BINDING OR IMGUI_BUILD_OPENGL3_GL3W_BINDING OR IMGUI_BUILD_OPENGL3_GLBINDING_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_opengl3.h DESTINATION include) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3.h DESTINATION include) endif() if(IMGUI_BUILD_OSX_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_osx.h DESTINATION include) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_osx.h DESTINATION include) endif() if(IMGUI_BUILD_SDL2_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_sdl.h DESTINATION include) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdl.h DESTINATION include) endif() if(IMGUI_BUILD_VULKAN_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_vulkan.h DESTINATION include) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_vulkan.h DESTINATION include) endif() if(IMGUI_BUILD_WIN32_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_win32.h DESTINATION include) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_win32.h DESTINATION include) endif() if(IMGUI_FREETYPE) diff --git a/ports/imgui/CONTROL b/ports/imgui/CONTROL index 08a4d67b2..4544e7962 100644 --- a/ports/imgui/CONTROL +++ b/ports/imgui/CONTROL @@ -1,5 +1,6 @@ Source: imgui Version: 1.81 +Port-Version: 1 Homepage: https://github.com/ocornut/imgui Description: Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies. diff --git a/versions/baseline.json b/versions/baseline.json index 389149f51..7aa24c167 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2530,7 +2530,7 @@ }, "imgui": { "baseline": "1.81", - "port-version": 0 + "port-version": 1 }, "imgui-sfml": { "baseline": "2.1-2", diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index c46c237dd..4adf95168 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "6f5ea94c84f8e4d7883a613421ef285960ce7482", + "version-string": "1.81", + "port-version": 1 + }, + { "git-tree": "a4eda15784b1da0ef71c67177bae1126dcfba52e", "version-string": "1.81", "port-version": 0 |
