Compare commits

..

2 Commits

Author SHA1 Message Date
5bcacdbc49 Mimalloc Asan (#7)
All checks were successful
Conan Packaging / Package cli11/2.6.1 (push) Successful in 19s
Conan Packaging / Package eabase/01082025 (push) Successful in 14s
Conan Packaging / Package eastl/3.27.01 (push) Successful in 20s
Conan Packaging / Package flatbuffers/25.12.19 (push) Successful in 1m10s
Conan Packaging / Package lodepng/cci.20260210 (push) Successful in 19s
Conan Packaging / Package meshoptimizer/1.0 (push) Successful in 18s
Conan Packaging / Package assimp/6.0.4 (push) Successful in 2m52s
Conan Packaging / Package mimalloc/3.2.8 (push) Successful in 24s
Conan Packaging / Package rapidhash/3.0 (push) Successful in 13s
Conan Packaging / Package unordered_dense/4.8.1 (push) Successful in 19s
Conan Packaging / Package vulkan-memory-allocator/3.3.0 (push) Successful in 19s
Conan Packaging / Package pixelmatch-cpp17/1.0.3 (push) Successful in 18s
Conan Packaging / Package sqlite3/3.51.2 (push) Successful in 41s
Conan Packaging / Package stduuid/1.2.3 (push) Successful in 18s
Conan Packaging / Package vulkan-utility-libraries/1.4.313.0 (push) Successful in 19s
Conan Packaging / Package shaderc/2025.3 (push) Successful in 3m50s
Conan Packaging / Package vulkan-validationlayers/1.4.313.0 (push) Successful in 7m30s
Reviewed-on: #7
Co-authored-by: Romain BOULLARD <romain.boullard@protonmail.com>
Co-committed-by: Romain BOULLARD <romain.boullard@protonmail.com>
2026-02-20 18:41:41 +00:00
15d5da0401 Update packages (#6)
All checks were successful
Conan Packaging / Package cli11/2.6.1 (push) Successful in 20s
Conan Packaging / Package sqlite3/3.51.2 (push) Successful in 37s
Conan Packaging / Package vulkan-memory-allocator/3.3.0 (push) Successful in 16s
Conan Packaging / Package vulkan-utility-libraries/1.4.313.0 (push) Successful in 21s
Conan Packaging / Package vulkan-validationlayers/1.4.313.0 (push) Successful in 6m42s
Conan Packaging / Package assimp/6.0.4 (push) Successful in 2m35s
Conan Packaging / Package eabase/01082025 (push) Successful in 13s
Conan Packaging / Package eastl/3.27.01 (push) Successful in 18s
Conan Packaging / Package flatbuffers/25.12.19 (push) Successful in 1m4s
Conan Packaging / Package lodepng/cci.20260210 (push) Successful in 18s
Conan Packaging / Package meshoptimizer/1.0 (push) Successful in 17s
Conan Packaging / Package mimalloc/3.2.8 (push) Successful in 25s
Conan Packaging / Package pixelmatch-cpp17/1.0.3 (push) Successful in 17s
Conan Packaging / Package rapidhash/3.0 (push) Successful in 16s
Conan Packaging / Package shaderc/2025.3 (push) Successful in 3m26s
Conan Packaging / Package stduuid/1.2.3 (push) Successful in 15s
Conan Packaging / Package unordered_dense/4.8.1 (push) Successful in 15s
Reviewed-on: #6
Co-authored-by: Romain BOULLARD <romain.boullard@protonmail.com>
Co-committed-by: Romain BOULLARD <romain.boullard@protonmail.com>
2026-02-11 13:27:57 +00:00

View File

@@ -93,6 +93,11 @@ 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 \
@@ -214,8 +219,12 @@ 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):
self.cpp_info.set_property("cmake_file_name", "mimalloc") if(self.options.asan):
self.cpp_info.set_property("cmake_target_name", "mimalloc" if self.options.shared else "mimalloc-static") 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_target_name", "mimalloc" if self.options.shared else "mimalloc-static")
if self.options.get_safe("inject"): if self.options.get_safe("inject"):
self.cpp_info.includedirs = [] self.cpp_info.includedirs = []