aboutsummaryrefslogtreecommitdiff
path: root/ports/imgui/portfile.cmake
diff options
context:
space:
mode:
authorRémy Tassoux <contact@rt2.fr>2021-10-13 23:47:17 +0200
committerGitHub <noreply@github.com>2021-10-13 14:47:17 -0700
commitde256f1c2ece3675983576beec63243f8a8fcce7 (patch)
tree6578149c89c3b501a27a5e4f57f7d6ed6217a90e /ports/imgui/portfile.cmake
parent7ddad237bb158f79e7b2540f3b2a325f3c8ac365 (diff)
downloadvcpkg-de256f1c2ece3675983576beec63243f8a8fcce7.tar.gz
vcpkg-de256f1c2ece3675983576beec63243f8a8fcce7.zip
[imgui] Update to 1.85 (#20679)
* [imgui] Update to 1.85 * [imgui] Update version files * [imgui] Replace deprecated vcpkg functions * [imgui] Update version files Co-authored-by: Rémy Tassoux <rt2@rasterizedworld.com>
Diffstat (limited to 'ports/imgui/portfile.cmake')
-rw-r--r--ports/imgui/portfile.cmake16
1 files changed, 8 insertions, 8 deletions
diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake
index 45add6cc0..12fcbb786 100644
--- a/ports/imgui/portfile.cmake
+++ b/ports/imgui/portfile.cmake
@@ -4,16 +4,16 @@ if ("docking-experimental" IN_LIST FEATURES)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ocornut/imgui
- REF dedb381c510cc0b87164e16b9e7ef6bf50ffccec
- SHA512 0b331cbf81fed15cdceb84ccf1962b5db19af1b6dc75a19460810919b7f61088a9ba46acf3e6fcadfda6297204b03f1be0ab08fa427f89e504d70be8da1f2281
+ REF 1b215ecb018ba0fd170618366ddc4be9bd45f283
+ SHA512 afd79082c4439b47d5943df5f7ddbdf80dcf23cd120b8da99b67b2979728e604436dd656ef8e8ae0af2a9050f8ea56b2f8c109243326fb842d684027616843e7
HEAD_REF docking
)
else()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ocornut/imgui
- REF v1.84.2
- SHA512 ea62d03ffc4c8d3dbc6be0076fb93158d464f4f02e88028c2bc64768f72e3117297854816bb7a776bd750c003013fe1d2871a1b505d04dd0922dfb2f214dd0a3
+ REF v1.85
+ SHA512 830ff36681a661d77754fb7818bb13cc63da58a293d343a8d6847a586f00c6e0bfc3ffe51cdf882849e5083d4ddca52cdbdc1b3abc9b794a96f89ae7628f1fc2
HEAD_REF master
)
endif()
@@ -40,6 +40,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
opengl3-binding IMGUI_BUILD_OPENGL3_BINDING
osx-binding IMGUI_BUILD_OSX_BINDING
sdl2-binding IMGUI_BUILD_SDL2_BINDING
+ sdl2-renderer-binding IMGUI_BUILD_SDL2_RENDERER_BINDING
vulkan-binding IMGUI_BUILD_VULKAN_BINDING
win32-binding IMGUI_BUILD_WIN32_BINDING
freetype IMGUI_FREETYPE
@@ -59,9 +60,8 @@ if ("libigl-imgui" IN_LIST FEATURES)
file(INSTALL ${IMGUI_FONTS_DROID_SANS_H} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
endif()
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
OPTIONS
${FEATURE_OPTIONS}
OPTIONS_DEBUG
@@ -70,7 +70,7 @@ vcpkg_configure_cmake(
IMGUI_COPY_MARMALADE_BINDING
)
-vcpkg_install_cmake()
+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")
@@ -80,6 +80,6 @@ if ("wchar32" IN_LIST FEATURES)
endif()
vcpkg_copy_pdbs()
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_config_fixup()
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)