File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -206,14 +206,6 @@ if(ENABLE_GUI OR ENABLE_CLI)
206206 add_subdirectory (extlib/libdxfrw )
207207endif ()
208208
209- message (STATUS "Using in-tree mimalloc" )
210- set (MI_OVERRIDE OFF CACHE BOOL "" )
211- set (MI_BUILD_SHARED OFF CACHE BOOL "" )
212- set (MI_BUILD_OBJECT OFF CACHE BOOL "" )
213- set (MI_BUILD_TESTS OFF CACHE BOOL "" )
214- add_subdirectory (extlib/mimalloc EXCLUDE_FROM_ALL )
215- set (MIMALLOC_INCLUDE_DIR ${CMAKE_SOURCE_DIR} /extlib/mimalloc/include)
216-
217209if (NOT FORCE_VENDORED_Eigen3)
218210 find_package (Eigen3 CONFIG )
219211endif ()
Original file line number Diff line number Diff line change @@ -23,15 +23,13 @@ target_include_directories(slvs_deps SYSTEM INTERFACE
2323 ${PNG_PNG_INCLUDE_DIR}
2424 ${FREETYPE_INCLUDE_DIRS}
2525 ${CAIRO_INCLUDE_DIRS}
26- ${MIMALLOC_INCLUDE_DIR}
2726 ${EIGEN3_INCLUDE_DIRS} )
2827target_link_libraries (slvs_deps INTERFACE
2928 dxfrw
3029 ${ZLIB_LIBRARY}
3130 ${PNG_LIBRARY}
3231 ${FREETYPE_LIBRARY}
33- ${CAIRO_LIBRARIES}
34- mimalloc-static )
32+ ${CAIRO_LIBRARIES} )
3533
3634if (Backtrace_FOUND)
3735 target_include_directories (slvs_deps SYSTEM INTERFACE
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ add_library(slvs-interface INTERFACE)
55target_sources (slvs-interface INTERFACE lib.cpp )
66target_compile_definitions (slvs-interface INTERFACE -DLIBRARY )
77target_include_directories (slvs-interface INTERFACE ${CMAKE_SOURCE_DIR} /include )
8- target_link_libraries (slvs-interface INTERFACE slvs-solver mimalloc-static )
8+ target_link_libraries (slvs-interface INTERFACE slvs-solver )
99
1010if (ENABLE_PYTHON_LIB)
1111 add_custom_command (
You can’t perform that action at this time.
0 commit comments