diff --git a/ports/mimalloc/portfile.cmake b/ports/mimalloc/portfile.cmake index 44b4c4aa48..a4ebec0cd6 100644 --- a/ports/mimalloc/portfile.cmake +++ b/ports/mimalloc/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/mimalloc REF "v${VERSION}" - SHA512 6cb7d1adc653a14abd209f98c141179393a2aaf78916d46c85f1dd71dc9c898b6a4f3b8b7bda54e008202dce824b7fc8852310b68821700641f8fac9482b4e3e + SHA512 c5d92b42302c564b5949a9002f92ae096f7afaaf283ec21e01db6529ae4f1fa979ce0dc7bf268c25ad6e13d0bb2273df41f7f7304c39e2ab01ff2463e2878329 HEAD_REF dev3 PATCHES pkgconfig-cxx.diff diff --git a/ports/mimalloc/vcpkg-cmake-wrapper.cmake b/ports/mimalloc/vcpkg-cmake-wrapper.cmake index 15ad847825..281d8ce1db 100644 --- a/ports/mimalloc/vcpkg-cmake-wrapper.cmake +++ b/ports/mimalloc/vcpkg-cmake-wrapper.cmake @@ -1,21 +1,21 @@ -_find_package(${ARGS}) - -if(CMAKE_CURRENT_LIST_DIR STREQUAL "${MIMALLOC_CMAKE_DIR}/${MIMALLOC_VERSION_DIR}") - set(MIMALLOC_INCLUDE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") - # As in vcpkg.cmake - if(NOT DEFINED CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE MATCHES "^[Dd][Ee][Bb][Uu][Gg]$") - set(MIMALLOC_LIBRARY_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib") - else() - set(MIMALLOC_LIBRARY_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib") - endif() - set(MIMALLOC_OBJECT_DIR "MIMALLOC_OBJECT_DIR-NOTFOUND") # not installed - set(MIMALLOC_TARGET_DIR "${MIMALLOC_LIBRARY_DIR}") -endif() - -if(TARGET mimalloc AND NOT TARGET mimalloc-static) - add_library(mimalloc-static INTERFACE IMPORTED) - set_target_properties(mimalloc-static PROPERTIES INTERFACE_LINK_LIBRARIES mimalloc) -elseif(TARGET mimalloc-static AND NOT TARGET mimalloc) - add_library(mimalloc INTERFACE IMPORTED) - set_target_properties(mimalloc PROPERTIES INTERFACE_LINK_LIBRARIES mimalloc-static) -endif() +_find_package(${ARGS}) + +if(CMAKE_CURRENT_LIST_DIR STREQUAL "${MIMALLOC_CMAKE_DIR}/${MIMALLOC_VERSION_DIR}") + set(MIMALLOC_INCLUDE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") + # As in vcpkg.cmake + if(NOT DEFINED CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE MATCHES "^[Dd][Ee][Bb][Uu][Gg]$") + set(MIMALLOC_LIBRARY_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib") + else() + set(MIMALLOC_LIBRARY_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib") + endif() + set(MIMALLOC_OBJECT_DIR "MIMALLOC_OBJECT_DIR-NOTFOUND") # not installed + set(MIMALLOC_TARGET_DIR "${MIMALLOC_LIBRARY_DIR}") +endif() + +if(TARGET mimalloc AND NOT TARGET mimalloc-static) + add_library(mimalloc-static INTERFACE IMPORTED) + set_target_properties(mimalloc-static PROPERTIES INTERFACE_LINK_LIBRARIES mimalloc) +elseif(TARGET mimalloc-static AND NOT TARGET mimalloc) + add_library(mimalloc INTERFACE IMPORTED) + set_target_properties(mimalloc PROPERTIES INTERFACE_LINK_LIBRARIES mimalloc-static) +endif() diff --git a/ports/mimalloc/vcpkg.json b/ports/mimalloc/vcpkg.json index f20da02474..8308265cbf 100644 --- a/ports/mimalloc/vcpkg.json +++ b/ports/mimalloc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mimalloc", - "version": "3.4.5", + "version": "3.5.0", "description": "Compact general purpose allocator with excellent performance", "homepage": "https://github.com/microsoft/mimalloc", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 36b8b74dda..4fb89c344f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6641,7 +6641,7 @@ "port-version": 3 }, "mimalloc": { - "baseline": "3.4.5", + "baseline": "3.5.0", "port-version": 0 }, "mimicpp": { diff --git a/versions/m-/mimalloc.json b/versions/m-/mimalloc.json index ef168b3588..d01eeab1ad 100644 --- a/versions/m-/mimalloc.json +++ b/versions/m-/mimalloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43024c6113ce1e24b49936d17d0c0efe2857b310", + "version": "3.5.0", + "port-version": 0 + }, { "git-tree": "247ee26c07fe08193aa7c63426291a5a379c8e21", "version": "3.4.5",