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 4a14c69554f7d07cc72d8b99f4322990c9cd2696 Mon Sep 17 00:00:00 2001 From: daanx Date: Wed, 15 Jan 2025 12:11:52 -0800 Subject: [PATCH 3/3] disable using vcpkg in the VS projects --- ide/vs2022/mimalloc-lib.vcxproj | 3 +++ ide/vs2022/mimalloc-override-dll.vcxproj | 3 +++ ide/vs2022/mimalloc-override-test-dep.vcxproj | 3 +++ ide/vs2022/mimalloc-override-test.vcxproj | 3 +++ ide/vs2022/mimalloc-test-api.vcxproj | 3 +++ ide/vs2022/mimalloc-test-stress.vcxproj | 3 +++ ide/vs2022/mimalloc-test.vcxproj | 3 +++ 7 files changed, 21 insertions(+) diff --git a/ide/vs2022/mimalloc-lib.vcxproj b/ide/vs2022/mimalloc-lib.vcxproj index 3359e6c0..c6c2cb5f 100644 --- a/ide/vs2022/mimalloc-lib.vcxproj +++ b/ide/vs2022/mimalloc-lib.vcxproj @@ -164,6 +164,9 @@ .lib mimalloc + + false + Level4 diff --git a/ide/vs2022/mimalloc-override-dll.vcxproj b/ide/vs2022/mimalloc-override-dll.vcxproj index d80d0b02..133b3efa 100644 --- a/ide/vs2022/mimalloc-override-dll.vcxproj +++ b/ide/vs2022/mimalloc-override-dll.vcxproj @@ -160,6 +160,9 @@ .dll mimalloc + + false + Level3 diff --git a/ide/vs2022/mimalloc-override-test-dep.vcxproj b/ide/vs2022/mimalloc-override-test-dep.vcxproj index 606bec9c..c1b89690 100644 --- a/ide/vs2022/mimalloc-override-test-dep.vcxproj +++ b/ide/vs2022/mimalloc-override-test-dep.vcxproj @@ -148,6 +148,9 @@ $(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\ $(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\ + + false + Level3 diff --git a/ide/vs2022/mimalloc-override-test.vcxproj b/ide/vs2022/mimalloc-override-test.vcxproj index ae465349..1dc2cee7 100644 --- a/ide/vs2022/mimalloc-override-test.vcxproj +++ b/ide/vs2022/mimalloc-override-test.vcxproj @@ -148,6 +148,9 @@ $(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\ $(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\ + + false + Level3 diff --git a/ide/vs2022/mimalloc-test-api.vcxproj b/ide/vs2022/mimalloc-test-api.vcxproj index b7f97ad2..440693a2 100644 --- a/ide/vs2022/mimalloc-test-api.vcxproj +++ b/ide/vs2022/mimalloc-test-api.vcxproj @@ -148,6 +148,9 @@ $(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\ $(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\ + + false + Level3 diff --git a/ide/vs2022/mimalloc-test-stress.vcxproj b/ide/vs2022/mimalloc-test-stress.vcxproj index cb761f94..d6af71ce 100644 --- a/ide/vs2022/mimalloc-test-stress.vcxproj +++ b/ide/vs2022/mimalloc-test-stress.vcxproj @@ -148,6 +148,9 @@ $(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\ $(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\ + + false + Level3 diff --git a/ide/vs2022/mimalloc-test.vcxproj b/ide/vs2022/mimalloc-test.vcxproj index 83202dbe..1e41fca1 100644 --- a/ide/vs2022/mimalloc-test.vcxproj +++ b/ide/vs2022/mimalloc-test.vcxproj @@ -148,6 +148,9 @@ $(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\ $(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\ + + false + Level3