diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2019-08-19 21:40:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-19 21:40:43 +0200 |
| commit | 70f4aabbe8bf5273e11a03f804d4361354cf0a11 (patch) | |
| tree | c2d553869f70b8fce7b2539bcaa8ffb8bb8aa0cc /ports/mimalloc | |
| parent | 173642528e2cf7a3f18b41d903b5ff5a758d34ae (diff) | |
| parent | 8e7ce6d91a060bba5f9e252a5d9aad92f5bd4a56 (diff) | |
| download | vcpkg-70f4aabbe8bf5273e11a03f804d4361354cf0a11.tar.gz vcpkg-70f4aabbe8bf5273e11a03f804d4361354cf0a11.zip | |
Merge branch 'master' into path_separator
Diffstat (limited to 'ports/mimalloc')
| -rw-r--r-- | ports/mimalloc/CONTROL | 2 | ||||
| -rw-r--r-- | ports/mimalloc/portfile.cmake | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/ports/mimalloc/CONTROL b/ports/mimalloc/CONTROL index 127d64590..daf48d8ce 100644 --- a/ports/mimalloc/CONTROL +++ b/ports/mimalloc/CONTROL @@ -1,5 +1,5 @@ Source: mimalloc
-Version: 2019-06-25
+Version: 2019-06-25-1
Description: Compact general purpose allocator with excellent performance
Homepage: https://github.com/microsoft/mimalloc
diff --git a/ports/mimalloc/portfile.cmake b/ports/mimalloc/portfile.cmake index a520b3ba5..1a11284f5 100644 --- a/ports/mimalloc/portfile.cmake +++ b/ports/mimalloc/portfile.cmake @@ -10,10 +10,10 @@ vcpkg_from_github( fix-cmake.patch
)
-vcpkg_check_features(
- asm MI_SEE_ASM
- secure MI_SECURE
- override MI_OVERRIDE
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+ asm MI_SEE_ASM
+ secure MI_SECURE
+ override MI_OVERRIDE
)
vcpkg_configure_cmake(
@@ -24,11 +24,9 @@ vcpkg_configure_cmake( OPTIONS_RELEASE
-DMI_CHECK_FULL=OFF
OPTIONS
- -DMI_OVERRIDE=${MI_OVERRIDE}
-DMI_INTERPOSE=ON
- -DMI_SEE_ASM=${MI_SEE_ASM}
-DMI_USE_CXX=OFF
- -DMI_SECURE=${MI_SECURE}
+ ${FEATURE_OPTIONS}
)
vcpkg_install_cmake()
|