From 866ce5b89db1dbc3e66bbf89041291fd16329518 Mon Sep 17 00:00:00 2001 From: Daan Date: Mon, 13 Jan 2025 16:57:59 -0800 Subject: [PATCH 1/3] vcpkg: remove INTERFACE_INCLUDE_DIRECTORIES again --- contrib/vcpkg/vcpkg-cmake-wrapper.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/vcpkg/vcpkg-cmake-wrapper.cmake b/contrib/vcpkg/vcpkg-cmake-wrapper.cmake index 6b917347..1b355722 100644 --- a/contrib/vcpkg/vcpkg-cmake-wrapper.cmake +++ b/contrib/vcpkg/vcpkg-cmake-wrapper.cmake @@ -17,5 +17,4 @@ endif() if(TARGET mimalloc-static AND NOT TARGET mimalloc) add_library(mimalloc INTERFACE IMPORTED) set_target_properties(mimalloc PROPERTIES INTERFACE_LINK_LIBRARIES mimalloc-static) - set_target_properties(mimalloc PROPERTIES INTERFACE_INCLUDE_DIRECTORIES mimalloc-static) endif() From 97c304dc3908f776e64a570474e9ffaa48f98bad Mon Sep 17 00:00:00 2001 From: Daan Date: Mon, 13 Jan 2025 16:59:24 -0800 Subject: [PATCH 2/3] vcpkg: bump sha --- contrib/vcpkg/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/vcpkg/portfile.cmake b/contrib/vcpkg/portfile.cmake index 058ce985..f5f39009 100644 --- a/contrib/vcpkg/portfile.cmake +++ b/contrib/vcpkg/portfile.cmake @@ -5,11 +5,11 @@ vcpkg_from_github( # The "REF" can be a commit hash, branch name (dev2), or a version (v2.2.1). # REF "v${VERSION}" - REF be05b232e8a51e076aae6d8f4a5c3049ce51cb01 + REF 866ce5b89db1dbc3e66bbf89041291fd16329518 # The sha512 is the hash of the tar.gz bundle. # (To get the sha512, run `vcpkg install mimalloc[override] --overlay-ports=` and copy the sha from the error message.) - SHA512 24f640db050d6263e557fe9d024e6c0435762118605c0d04801efbcb32e96382b0b995000715fc0c2dcd67c67825a100a6690ecf0ef097b0a3ae107a82d74f7d + SHA512 0b0e5ff823c49b9534b8c32800679806c5d7c29020af058da043c3e6e36ae3c32a1cdd5a21ece97dd60bc7dd4703967f683beac435dbb8514638a6cc55e5dea8 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS From e4befd1ce820c6988210156e291d5021e263b5d3 Mon Sep 17 00:00:00 2001 From: Daan Date: Mon, 13 Jan 2025 17:02:02 -0800 Subject: [PATCH 3/3] vcpkg: bump sha --- contrib/vcpkg/portfile.cmake | 4 ++-- contrib/vcpkg/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/vcpkg/portfile.cmake b/contrib/vcpkg/portfile.cmake index f5f39009..55f0172f 100644 --- a/contrib/vcpkg/portfile.cmake +++ b/contrib/vcpkg/portfile.cmake @@ -5,11 +5,11 @@ vcpkg_from_github( # The "REF" can be a commit hash, branch name (dev2), or a version (v2.2.1). # REF "v${VERSION}" - REF 866ce5b89db1dbc3e66bbf89041291fd16329518 + REF 6a89f8554eaab8d8d00e17b5b09f79e1d8dbf61b # The sha512 is the hash of the tar.gz bundle. # (To get the sha512, run `vcpkg install mimalloc[override] --overlay-ports=` and copy the sha from the error message.) - SHA512 0b0e5ff823c49b9534b8c32800679806c5d7c29020af058da043c3e6e36ae3c32a1cdd5a21ece97dd60bc7dd4703967f683beac435dbb8514638a6cc55e5dea8 + SHA512 32b87a3195efcc558b83a546348a8fb544fed335cdd6c9f8e7e9d0e8e64540fdcf1f4aa57fd0e783b78731518f4810292b832227d7e7665bf8426f1e6ce96f9d ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/contrib/vcpkg/vcpkg.json b/contrib/vcpkg/vcpkg.json index bdbe9ba1..95d3b15d 100644 --- a/contrib/vcpkg/vcpkg.json +++ b/contrib/vcpkg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mimalloc", - "version": "1.9.2", + "version": "3.0.2", "port-version": 2, "description": "Compact general purpose allocator with excellent performance", "homepage": "https://github.com/microsoft/mimalloc",