diff --git a/Bin2CPP/Sources/Bin2CPPLib/CMakeLists.txt b/Bin2CPP/Sources/Bin2CPPLib/CMakeLists.txt index d548139..e0acc2b 100644 --- a/Bin2CPP/Sources/Bin2CPPLib/CMakeLists.txt +++ b/Bin2CPP/Sources/Bin2CPPLib/CMakeLists.txt @@ -35,7 +35,6 @@ target_link_libraries(${PROJECT_NAME} PRIVATE Bin2CPPCompileAndLinkFlags PUBLIC - $,mimalloc-asan,mimalloc-static> quill::quill $<$:cpptrace::cpptrace> magic_enum::magic_enum) diff --git a/CMake/FindDependencies.cmake b/CMake/FindDependencies.cmake index d4c47b6..6c2d188 100644 --- a/CMake/FindDependencies.cmake +++ b/CMake/FindDependencies.cmake @@ -9,12 +9,6 @@ find_package(magic_enum REQUIRED) find_package(CLI11 REQUIRED) find_package(quill REQUIRED) -if(${ASAN}) - find_package(mimalloc-asan REQUIRED) -else() - find_package(mimalloc REQUIRED) -endif() - find_package(cpptrace REQUIRED) if(BUILD_TESTS) diff --git a/conanfile.py b/conanfile.py index 84bc3a1..428e5da 100644 --- a/conanfile.py +++ b/conanfile.py @@ -45,13 +45,9 @@ class Bin2CPP(ConanFile): if self.settings.os == "Windows": del self.options.fPIC - if(self.options.asan): - self.options["mimalloc"].asan = True - def requirements(self): self.requires("quill/11.0.2", 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("cpptrace/1.0.4", transitive_headers=True)