Fix version
Some checks failed
Conan Packaging / Package assimp/6.0.4 (push) Successful in 3m13s
Conan Packaging / Package unordered_dense/4.8.1 (push) Successful in 16s
Conan Packaging / Package vulkan-memory-allocator/3.3.0 (push) Successful in 20s
Conan Packaging / Package glslang/1.4.341.0 (push) Successful in 2m56s
Conan Packaging / Package pixelmatch-cpp17/1.0.3 (push) Successful in 21s
Conan Packaging / Package rapidhash/3.0 (push) Successful in 14s
Conan Packaging / Package spirv-headers/1.4.341.0 (push) Successful in 13s
Conan Packaging / Package stduuid/1.2.3 (push) Successful in 15s
Conan Packaging / Package sqlite3/3.51.2 (push) Successful in 38s
Conan Packaging / Package vulkan-headers/1.4.341.0 (push) Successful in 15s
Conan Packaging / Package eastl/3.27.01 (push) Successful in 17s
Conan Packaging / Package spirv-tools/1.4.341.0 (push) Successful in 2m17s
Conan Packaging / Package shaderc/2026.1 (push) Failing after 8s
Conan Packaging / Package vulkan-validationlayers/1.4.341.0 (push) Failing after 11s
Conan Packaging / Package cli11/2.6.1 (push) Successful in 19s
Conan Packaging / Package eabase/01082025 (push) Successful in 14s
Conan Packaging / Package flatbuffers/25.12.19 (push) Successful in 1m13s
Conan Packaging / Package lodepng/cci.20260210 (push) Successful in 23s
Conan Packaging / Package meshoptimizer/1.0 (push) Successful in 22s
Conan Packaging / Package mimalloc/3.2.8 (push) Successful in 24s

This commit is contained in:
2026-04-12 19:52:05 +02:00
parent 1dd9adf4fd
commit 17eea3fe02
5 changed files with 29 additions and 9 deletions

View File

@@ -101,15 +101,24 @@ class VulkanValidationLayersConan(ConanFile):
def requirements(self):
self.requires("robin-hood-hashing/3.11.5")
self.requires(self._require("spirv-headers"))
if Version(conan_version).minor >= "1.4.341":
self.requires(f"{self._require("spirv-headers")}@{self.user}/{self.channel}")
else:
self.requires(self._require("spirv-headers"))
if Version(conan_version).minor >= "1.4.313":
self.requires(f"{self._require("vulkan-utility-libraries")}@{self.user}/{self.channel}", transitive_headers=True)
if Version(conan_version).major < "2":
# TODO: set private=True, once the issue is resolved https://github.com/conan-io/conan/issues/9390
self.requires(self._require("spirv-tools"), private=not hasattr(self, "settings_build"))
else:
self.requires(self._require("spirv-tools"))
self.requires(self._require("vulkan-headers"), transitive_headers=True)
if Version(conan_version).minor >= "1.4.341":
self.requires(f"{self._require("spirv-tools")}@{self.user}/{self.channel}")
else:
self.requires(self._require("spirv-tools"))
if Version(conan_version).minor >= "1.4.341":
self.requires(f"{self._require("vulkan-headers")}@{self.user}/{self.channel}", transitive_headers=True)
else:
self.requires(self._require("vulkan-headers"), transitive_headers=True)
if self.options.get_safe("with_wsi_xcb") or self.options.get_safe("with_wsi_xlib"):
self.requires("xorg/system")
if self._needs_wayland_for_build: