diff --git a/CMakeLists.txt b/CMakeLists.txt index 27e52d58..e2976bbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -586,10 +586,13 @@ if(MI_BUILD_SHARED) install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) if(WIN32) - # On windows, the import library name for the dll would clash with the static mimalloc.lib - # so we postfix the dll import library with `.dll.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` (and also the .pdb debug file) set_property(TARGET mimalloc PROPERTY ARCHIVE_OUTPUT_NAME "${mi_libname}.dll" ) install(FILES "$/${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 "$/${mi_libname}.dll.pdb" DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() if(WIN32 AND MI_WIN_REDIRECT) # On windows, link and copy the mimalloc redirection dll too. diff --git a/contrib/vcpkg/vcpkg.json b/contrib/vcpkg/vcpkg.json index 69a72edf..bdbe9ba1 100644 --- a/contrib/vcpkg/vcpkg.json +++ b/contrib/vcpkg/vcpkg.json @@ -19,7 +19,7 @@ "features": { "c": { "description": "Use C11 compilation (this can still override new/delete)" - }, + }, "override": { "description": "Override the standard malloc/free interface" }, @@ -31,6 +31,6 @@ }, "asm": { "description": "Generate assembly files" - } + } } } \ No newline at end of file