kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-07 15:59:32 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev3' into dev3-bin

Browse source
This commit is contained in:
Daan 2025-01-13 17:02:54 -08:00
commit 3c272a5b1b
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/vcpkg/portfile.cmake
View file

@ -5,11 +5,11 @@ vcpkg_from_github(
# The "REF" can be a commit hash, branch name (dev2), or a version (v2.2.1). # The "REF" can be a commit hash, branch name (dev2), or a version (v2.2.1).
# REF "v${VERSION}" # REF "v${VERSION}"
REF be05b232e8a51e076aae6d8f4a5c3049ce51cb01 REF 6a89f8554eaab8d8d00e17b5b09f79e1d8dbf61b
# The sha512 is the hash of the tar.gz bundle. # The sha512 is the hash of the tar.gz bundle.
# (To get the sha512, run `vcpkg install mimalloc[override] --overlay-ports=<dir of this file>` and copy the sha from the error message.) # (To get the sha512, run `vcpkg install mimalloc[override] --overlay-ports=<dir of this file>` and copy the sha from the error message.)
SHA512 24f640db050d6263e557fe9d024e6c0435762118605c0d04801efbcb32e96382b0b995000715fc0c2dcd67c67825a100a6690ecf0ef097b0a3ae107a82d74f7d SHA512 32b87a3195efcc558b83a546348a8fb544fed335cdd6c9f8e7e9d0e8e64540fdcf1f4aa57fd0e783b78731518f4810292b832227d7e7665bf8426f1e6ce96f9d
) )
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

1
contrib/vcpkg/vcpkg-cmake-wrapper.cmake
View file

@ -17,5 +17,4 @@ endif()
if(TARGET mimalloc-static AND NOT TARGET mimalloc) if(TARGET mimalloc-static AND NOT TARGET mimalloc)
add_library(mimalloc INTERFACE IMPORTED) add_library(mimalloc INTERFACE IMPORTED)
set_target_properties(mimalloc PROPERTIES INTERFACE_LINK_LIBRARIES mimalloc-static) set_target_properties(mimalloc PROPERTIES INTERFACE_LINK_LIBRARIES mimalloc-static)
set_target_properties(mimalloc PROPERTIES INTERFACE_INCLUDE_DIRECTORIES mimalloc-static)
endif() endif()

2
contrib/vcpkg/vcpkg.json
View file

@ -1,6 +1,6 @@
{ {
"name": "mimalloc", "name": "mimalloc",
"version": "1.9.2", "version": "3.0.2",
"port-version": 2, "port-version": 2,
"description": "Compact general purpose allocator with excellent performance", "description": "Compact general purpose allocator with excellent performance",
"homepage": "https://github.com/microsoft/mimalloc", "homepage": "https://github.com/microsoft/mimalloc",