fix asan packaging
All checks were successful
Conan Packaging / Package cli11/2.6.1 (push) Successful in 21s
Conan Packaging / Package flatbuffers/25.12.19 (push) Successful in 1m20s
Conan Packaging / Package lodepng/cci.20260210 (push) Successful in 22s
Conan Packaging / Package meshoptimizer/1.0 (push) Successful in 20s
Conan Packaging / Package eabase/01082025 (push) Successful in 14s
Conan Packaging / Package eastl/3.27.01 (push) Successful in 18s
Conan Packaging / Package mimalloc/3.2.8 (push) Successful in 23s
Conan Packaging / Package assimp/6.0.4 (push) Successful in 3m32s
Conan Packaging / Package pixelmatch-cpp17/1.0.3 (push) Successful in 20s
Conan Packaging / Package rapidhash/3.0 (push) Successful in 15s
Conan Packaging / Package sqlite3/3.51.2 (push) Successful in 39s
Conan Packaging / Package stduuid/1.2.3 (push) Successful in 19s
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 vulkan-utility-libraries/1.4.313.0 (push) Successful in 22s
Conan Packaging / Package shaderc/2025.3 (push) Successful in 3m55s
Conan Packaging / Package vulkan-validationlayers/1.4.313.0 (push) Successful in 6m58s
All checks were successful
Conan Packaging / Package cli11/2.6.1 (push) Successful in 21s
Conan Packaging / Package flatbuffers/25.12.19 (push) Successful in 1m20s
Conan Packaging / Package lodepng/cci.20260210 (push) Successful in 22s
Conan Packaging / Package meshoptimizer/1.0 (push) Successful in 20s
Conan Packaging / Package eabase/01082025 (push) Successful in 14s
Conan Packaging / Package eastl/3.27.01 (push) Successful in 18s
Conan Packaging / Package mimalloc/3.2.8 (push) Successful in 23s
Conan Packaging / Package assimp/6.0.4 (push) Successful in 3m32s
Conan Packaging / Package pixelmatch-cpp17/1.0.3 (push) Successful in 20s
Conan Packaging / Package rapidhash/3.0 (push) Successful in 15s
Conan Packaging / Package sqlite3/3.51.2 (push) Successful in 39s
Conan Packaging / Package stduuid/1.2.3 (push) Successful in 19s
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 vulkan-utility-libraries/1.4.313.0 (push) Successful in 22s
Conan Packaging / Package shaderc/2025.3 (push) Successful in 3m55s
Conan Packaging / Package vulkan-validationlayers/1.4.313.0 (push) Successful in 6m58s
This commit is contained in:
@@ -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 \
|
||||||
@@ -215,7 +220,12 @@ class MimallocConan(ConanFile):
|
|||||||
|
|
||||||
def package_info(self):
|
def package_info(self):
|
||||||
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")
|
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"):
|
if self.options.get_safe("inject"):
|
||||||
self.cpp_info.includedirs = []
|
self.cpp_info.includedirs = []
|
||||||
|
|||||||
Reference in New Issue
Block a user