From 81e50210c261898159e522204b1a6b9295606092 Mon Sep 17 00:00:00 2001 From: ruevs Date: Fri, 29 Sep 2023 13:00:47 +0300 Subject: [PATCH] Revert "Add and build mimalloc at 07c..." This reverts commit cbac182edfa10743393cfba56ffd1ecd74006ca0 Removing the `mimalloc` dependency will make it easier to build Windows XP (maybe even 2000) compatible versions of SolveSpace. --- CMakeLists.txt | 8 -------- src/CMakeLists.txt | 4 +--- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a012553f..8afe431ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -193,14 +193,6 @@ endif() message(STATUS "Using in-tree libdxfrw") add_subdirectory(extlib/libdxfrw) -message(STATUS "Using in-tree mimalloc") -set(MI_OVERRIDE OFF CACHE BOOL "") -set(MI_BUILD_SHARED OFF CACHE BOOL "") -set(MI_BUILD_OBJECT OFF CACHE BOOL "") -set(MI_BUILD_TESTS OFF CACHE BOOL "") -add_subdirectory(extlib/mimalloc EXCLUDE_FROM_ALL) -set(MIMALLOC_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/extlib/mimalloc/include) - if(NOT FORCE_VENDORED_Eigen3) find_package(Eigen3 CONFIG) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0e9129f49..d5f2afaba 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -27,15 +27,13 @@ target_include_directories(slvs_deps INTERFACE SYSTEM ${PNG_PNG_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS} - ${MIMALLOC_INCLUDE_DIR} ${EIGEN3_INCLUDE_DIRS}) target_link_libraries(slvs_deps INTERFACE dxfrw ${ZLIB_LIBRARY} ${PNG_LIBRARY} ${FREETYPE_LIBRARY} - ${CAIRO_LIBRARIES} - mimalloc-static) + ${CAIRO_LIBRARIES}) if(Backtrace_FOUND) target_include_directories(slvs_deps INTERFACE SYSTEM