BigfootDev/Bin2CPP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Mimalloc from Bin2CPP #6

Merged
rboullard merged 16 commits from Development into main 2026-03-30 09:35:54 +00:00
Conversation 0 Commits 16 Files Changed 4 -11
3 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 51afc4d228 - Show all commits

1
Bin2CPP/Sources/Bin2CPPLib/CMakeLists.txt
View File

@@ -35,7 +35,6 @@ target_link_libraries(${PROJECT_NAME}
PRIVATE PRIVATE
Bin2CPPCompileAndLinkFlags Bin2CPPCompileAndLinkFlags
PUBLIC PUBLIC
$<IF:$<BOOL:${ASAN}>,mimalloc-asan,mimalloc-static>
quill::quill quill::quill
$<$<CONFIG:Debug,RelWithDebInfo>:cpptrace::cpptrace> $<$<CONFIG:Debug,RelWithDebInfo>:cpptrace::cpptrace>
magic_enum::magic_enum) magic_enum::magic_enum)

6
CMake/FindDependencies.cmake
View File

@@ -9,12 +9,6 @@ find_package(magic_enum REQUIRED)
find_package(CLI11 REQUIRED) find_package(CLI11 REQUIRED)
find_package(quill REQUIRED) find_package(quill REQUIRED)
if(${ASAN})
find_package(mimalloc-asan REQUIRED)
else()
find_package(mimalloc REQUIRED)
endif()
find_package(cpptrace REQUIRED) find_package(cpptrace REQUIRED)
if(BUILD_TESTS) if(BUILD_TESTS)

4
conanfile.py
View File

@@ -45,13 +45,9 @@ class Bin2CPP(ConanFile):
if self.settings.os == "Windows": if self.settings.os == "Windows":
del self.options.fPIC del self.options.fPIC
if(self.options.asan):
self.options["mimalloc"].asan = True
def requirements(self): def requirements(self):
self.requires("quill/11.0.2", transitive_headers=True) self.requires("quill/11.0.2", transitive_headers=True)
self.requires("magic_enum/0.9.7", transitive_headers=True) self.requires("magic_enum/0.9.7", transitive_headers=True)
self.requires("mimalloc/3.2.8@bigfootdev/main", transitive_headers=True)
self.requires("cli11/2.6.1@bigfootdev/main") self.requires("cli11/2.6.1@bigfootdev/main")
self.requires("cpptrace/1.0.4", transitive_headers=True) self.requires("cpptrace/1.0.4", transitive_headers=True)