diff --git a/mimalloc/all/conanfile.py b/mimalloc/all/conanfile.py index 740aca8..24caa2d 100644 --- a/mimalloc/all/conanfile.py +++ b/mimalloc/all/conanfile.py @@ -93,6 +93,11 @@ class MimallocConan(ConanFile): raise ConanInvalidConfiguration( f"Currently, {self.ref} doesn't work properly with shared MD builds in CCI. Contributions welcomed") + if self.options.override and \ + self.options.asan: + raise ConanInvalidConfiguration( + "Asan requires Mimalloc to be compiled without override") + # Shared overriding requires dynamic runtime for MSVC: if self.options.override and \ self.options.shared and \ @@ -215,8 +220,13 @@ class MimallocConan(ConanFile): def package_info(self): self.cpp_info.set_property("cmake_file_name", "mimalloc") - self.cpp_info.set_property("cmake_target_name", "mimalloc" if self.options.shared else "mimalloc-static") - + if(self.options.asan): + self.cpp_info.set_property("cmake_target_name", "mimalloc-asan") + elif(self.options.shared): + self.cpp_info.set_property("cmake_target_name", "mimalloc") + else: + self.cpp_info.set_property("cmake_target_name", "mimalloc-static") + if self.options.get_safe("inject"): self.cpp_info.includedirs = [] self.cpp_info.libdirs = []