From 9b7e03938d7211b7605879fd3d114367e8564d20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Tassoux?= <contact@rt2.fr>
Date: Mon, 28 Mar 2022 22:43:39 +0200
Subject: [PATCH] [mimalloc] Update the CMake configuration options (#23802)

* [mimalloc] Portfile configuration fixes and improvements

* [mimalloc] Update version files
---
 ports/mimalloc/fix-cmake.patch | 12 +-----------
 ports/mimalloc/portfile.cmake  |  6 ++----
 ports/mimalloc/vcpkg.json      |  1 +
 versions/baseline.json         |  2 +-
 versions/m-/mimalloc.json      |  5 +++++
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/ports/mimalloc/fix-cmake.patch b/ports/mimalloc/fix-cmake.patch
index eb43278d04..dc8740a0a4 100644
--- a/ports/mimalloc/fix-cmake.patch
+++ b/ports/mimalloc/fix-cmake.patch
@@ -9,18 +9,8 @@
    endif()
  
 -  install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY)  
++  install(TARGETS mimalloc EXPORT mimalloc ARCHIVE DESTINATION ${mi_install_libdir} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${mi_install_libdir} NAMELINK_SKIP)
    install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir})
-+  install(TARGETS mimalloc EXPORT mimalloc ARCHIVE DESTINATION lib RUNTIME DESTINATION bin LIBRARY DESTINATION lib NAMELINK_SKIP)
  endif()
  
  # static library
-@@ -370,9 +370,6 @@ # install(TARGETS mimalloc-obj EXPORT mimalloc DESTINATION ${mi_install_objdir})
- 
-   # the FILES expression can also be: $<TARGET_OBJECTS:mimalloc-obj>
-   # but that fails cmake versions less than 3.10 so we leave it as is for now
--  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/mimalloc-obj.dir/src/static.c${CMAKE_C_OUTPUT_EXTENSION}
--          DESTINATION ${mi_install_objdir}
--          RENAME ${mi_basename}${CMAKE_C_OUTPUT_EXTENSION} )
- endif()
- 
- # -----------------------------------------------------------------------------
diff --git a/ports/mimalloc/portfile.cmake b/ports/mimalloc/portfile.cmake
index ff0f06366f..c1a47d2bdf 100644
--- a/ports/mimalloc/portfile.cmake
+++ b/ports/mimalloc/portfile.cmake
@@ -24,15 +24,13 @@ vcpkg_cmake_configure(
     OPTIONS_RELEASE
         -DMI_DEBUG_FULL=OFF
     OPTIONS
-        -DMI_INTERPOSE=ON
-        -DMI_USE_CXX=OFF
+        -DMI_USE_CXX=ON
         -DMI_BUILD_TESTS=OFF
+        -DMI_BUILD_OBJECT=OFF
         ${FEATURE_OPTIONS}
         -DMI_BUILD_STATIC=${MI_BUILD_STATIC}
         -DMI_BUILD_SHARED=${MI_BUILD_SHARED}
         -DMI_INSTALL_TOPLEVEL=ON
-    MAYBE_UNUSED_VARIABLES
-        MI_INTERPOSE
 )
 
 vcpkg_cmake_install()
diff --git a/ports/mimalloc/vcpkg.json b/ports/mimalloc/vcpkg.json
index 31f7d57b75..1a9c98b721 100644
--- a/ports/mimalloc/vcpkg.json
+++ b/ports/mimalloc/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "mimalloc",
   "version": "2.0.5",
+  "port-version": 1,
   "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 3b48c17b96..52f8efe690 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4470,7 +4470,7 @@
     },
     "mimalloc": {
       "baseline": "2.0.5",
-      "port-version": 0
+      "port-version": 1
     },
     "minc": {
       "baseline": "2.4.03",
diff --git a/versions/m-/mimalloc.json b/versions/m-/mimalloc.json
index 8c6494be1d..d5427e0d18 100644
--- a/versions/m-/mimalloc.json
+++ b/versions/m-/mimalloc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e4dc5fc89e8c1f860b9f07b3d449a5d67f56cfd4",
+      "version": "2.0.5",
+      "port-version": 1
+    },
     {
       "git-tree": "370692d9dc2cb2bc9f013041003e069e47febb67",
       "version": "2.0.5",