Skip to content

Commit 86661bb

Browse files
committed
cmake: use mimalloc instead of nedmalloc
Just like in the regular GCC (MINGW) build, let's do the same in the CMake (Visual C) build. This is a long-overdue companion patch to git-for-windows#4013 Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 2f819d1 commit 86661bb

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

contrib/buildsystems/CMakeLists.txt

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,10 +291,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
291291
add_compile_definitions(_CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE)
292292
endif()
293293
include_directories(${CMAKE_SOURCE_DIR}/compat/win32)
294+
include_directories(${CMAKE_SOURCE_DIR}/compat/mimalloc)
294295
add_compile_definitions(HAVE_ALLOCA_H NO_POSIX_GOODIES NATIVE_CRLF NO_UNIX_SOCKETS WIN32
295296
_CONSOLE DETECT_MSYS_TTY STRIP_EXTENSION=".exe" NO_SYMLINK_HEAD UNRELIABLE_FSTAT
296297
NOGDI OBJECT_CREATION_MODE=1 __USE_MINGW_ANSI_STDIO=0
297-
USE_NED_ALLOCATOR OVERRIDE_STRDUP MMAP_PREVENTS_DELETE USE_WIN32_MMAP
298+
USE_MIMALLOC OVERRIDE_STRDUP MMAP_PREVENTS_DELETE USE_WIN32_MMAP
298299
HAVE_WPGMPTR ENSURE_MSYSTEM_IS_SET HAVE_RTLGENRANDOM)
299300
list(APPEND compat_SOURCES
300301
compat/mingw.c
@@ -307,7 +308,19 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
307308
compat/win32/trace2_win32_process_info.c
308309
compat/win32/dirent.c
309310
compat/win32/wsl.c
310-
compat/nedmalloc/nedmalloc.c
311+
compat/mimalloc/alloc-aligned.c
312+
compat/mimalloc/alloc.c
313+
compat/mimalloc/arena.c
314+
compat/mimalloc/bitmap.c
315+
compat/mimalloc/heap.c
316+
compat/mimalloc/init.c
317+
compat/mimalloc/options.c
318+
compat/mimalloc/os.c
319+
compat/mimalloc/page.c
320+
compat/mimalloc/random.c
321+
compat/mimalloc/segment.c
322+
compat/mimalloc/segment-cache.c
323+
compat/mimalloc/stats.c
311324
compat/strdup.c
312325
compat/win32/fscache.c)
313326
set(NO_UNIX_SOCKETS 1)

0 commit comments

Comments
 (0)