diff --git a/contrib/vcpkg/portfile.cmake b/contrib/vcpkg/portfile.cmake index f5f39009..69661526 100644 --- a/contrib/vcpkg/portfile.cmake +++ b/contrib/vcpkg/portfile.cmake @@ -18,6 +18,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS guarded MI_GUARDED secure MI_SECURE override MI_OVERRIDE + optarch MI_OPT_ARCH + optsimd MI_OPT_SIMD xmalloc MI_XMALLOC asm MI_SEE_ASM ) @@ -26,16 +28,14 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" MI_BUILD_SHARED) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS_RELEASE - -DMI_OPT_ARCH=ON OPTIONS -DMI_USE_CXX=ON -DMI_BUILD_TESTS=OFF -DMI_BUILD_OBJECT=ON - ${FEATURE_OPTIONS} -DMI_BUILD_STATIC=${MI_BUILD_STATIC} -DMI_BUILD_SHARED=${MI_BUILD_SHARED} -DMI_INSTALL_TOPLEVEL=ON + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/contrib/vcpkg/vcpkg.json b/contrib/vcpkg/vcpkg.json index bdbe9ba1..45f8097b 100644 --- a/contrib/vcpkg/vcpkg.json +++ b/contrib/vcpkg/vcpkg.json @@ -26,9 +26,18 @@ "secure": { "description": "Use full security mitigations (like guard pages and randomization)" }, + "guarded": { + "description": "Use build that support guard pages after objects controlled with MIMALLOC_GUARDED_SAMPLE_RATE" + }, "xmalloc": { "description": "If out-of-memory, call abort() instead of returning NULL" }, + "optarch": { + "description": "Use architecture specific optimizations (on x64: '-march=haswell;-mavx2', on arm64: '-march=armv8.1-a')" + }, + "optsimd": { + "description": "Allow use of SIMD instructions (avx2 or neon) (requires 'optarch' to be enabled)" + }, "asm": { "description": "Generate assembly files" }