Skip to content

Commit

Permalink
Revert "Add and build mimalloc at 07c..."
Browse files Browse the repository at this point in the history
This reverts commit cbac182

Removing the `mimalloc` dependency will make it easier to build
Windows XP (maybe even 2000) compatible versions of SolveSpace.
  • Loading branch information
ruevs committed Sep 14, 2024
1 parent 9f052d0 commit 81e5021
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
8 changes: 0 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 1 addition & 3 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 81e5021

Please sign in to comment.