Compare commits
11 Commits
main
...
fb870a5028
| Author | SHA1 | Date | |
|---|---|---|---|
| fb870a5028 | |||
| 41c7a31b62 | |||
| 99959dbefc | |||
| c49e398f30 | |||
| edff40e77a | |||
| 6c90c821bf | |||
| 451568113a | |||
| 4689d0a002 | |||
| 030bf0a590 | |||
| 65be0a9fac | |||
| 534384356e |
@@ -93,11 +93,6 @@ class MimallocConan(ConanFile):
|
|||||||
raise ConanInvalidConfiguration(
|
raise ConanInvalidConfiguration(
|
||||||
f"Currently, {self.ref} doesn't work properly with shared MD builds in CCI. Contributions welcomed")
|
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:
|
# Shared overriding requires dynamic runtime for MSVC:
|
||||||
if self.options.override and \
|
if self.options.override and \
|
||||||
self.options.shared and \
|
self.options.shared and \
|
||||||
@@ -219,10 +214,6 @@ class MimallocConan(ConanFile):
|
|||||||
return os.path.join(self.package_folder, "lib", "cmake")
|
return os.path.join(self.package_folder, "lib", "cmake")
|
||||||
|
|
||||||
def package_info(self):
|
def package_info(self):
|
||||||
if(self.options.asan):
|
|
||||||
self.cpp_info.set_property("cmake_file_name", "mimalloc-asan")
|
|
||||||
self.cpp_info.set_property("cmake_target_name", "mimalloc-asan")
|
|
||||||
else:
|
|
||||||
self.cpp_info.set_property("cmake_file_name", "mimalloc")
|
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")
|
self.cpp_info.set_property("cmake_target_name", "mimalloc" if self.options.shared else "mimalloc-static")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user