kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-06 15:29:31 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into dev3

Browse source
This commit is contained in:
daanx 2025-01-11 12:32:33 -08:00
commit 250fcdac20
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -586,10 +586,13 @@ if(MI_BUILD_SHARED)
install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir})
if(WIN32) if(WIN32)
# On windows, the import library name for the dll would clash with the static mimalloc.lib # On windows, the import library name for the dll would clash with the static mimalloc.lib library
# so we postfix the dll import library with `.dll.lib`. # so we postfix the dll import library with `.dll.lib` (and also the .pdb debug file)
set_property(TARGET mimalloc PROPERTY ARCHIVE_OUTPUT_NAME "${mi_libname}.dll" ) set_property(TARGET mimalloc PROPERTY ARCHIVE_OUTPUT_NAME "${mi_libname}.dll" )
install(FILES "$<TARGET_FILE_DIR:mimalloc>/${mi_libname}.dll.lib" DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES "$<TARGET_FILE_DIR:mimalloc>/${mi_libname}.dll.lib" DESTINATION ${CMAKE_INSTALL_LIBDIR})
set_property(TARGET mimalloc PROPERTY PDB_NAME "${mi_libname}.dll")
# don't try to install the pdb since it may not be generated depending on the configuration
# install(FILES "$<TARGET_FILE_DIR:mimalloc>/${mi_libname}.dll.pdb" DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif() endif()
if(WIN32 AND MI_WIN_REDIRECT) if(WIN32 AND MI_WIN_REDIRECT)
# On windows, link and copy the mimalloc redirection dll too. # On windows, link and copy the mimalloc redirection dll too.

4
contrib/vcpkg/vcpkg.json
View file

@ -19,7 +19,7 @@
"features": { "features": {
"c": { "c": {
"description": "Use C11 compilation (this can still override new/delete)" "description": "Use C11 compilation (this can still override new/delete)"
}, },
"override": { "override": {
"description": "Override the standard malloc/free interface" "description": "Override the standard malloc/free interface"
}, },
@ -31,6 +31,6 @@
}, },
"asm": { "asm": {
"description": "Generate assembly files" "description": "Generate assembly files"
} }
} }
} }