Skip to content

Commit a7f6970

Browse files
authored
Update dependencies (#399)
* Update dependencies * Revert mold upgrade * Update vulkan version test
1 parent 53675ac commit a7f6970

2 files changed

Lines changed: 13 additions & 14 deletions

File tree

conanfile.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -144,42 +144,41 @@ def config_options(self):
144144
self.options.rm_safe("with_rs_direct_x12")
145145

146146
def build_requirements(self):
147-
self.tool_requires("ninja/1.12.1")
148-
self.test_requires("catch2/3.8.0")
147+
self.tool_requires("ninja/1.13.1")
148+
self.test_requires("catch2/3.9.0")
149149
self.test_requires("gtest/1.16.0")
150150

151-
if get_cmake_version() < Version("4.0.1"):
152-
self.tool_requires("cmake/4.0.1")
151+
if get_cmake_version() < Version("4.0.3"):
152+
self.tool_requires("cmake/4.0.3")
153153

154154
if self.options.build_docs:
155155
self.build_requires("doxygen/1.14.0")
156156

157157
if self.options.get_safe("link_with_mold", False):
158158
self.build_requires("mold/2.36.0")
159-
#self.build_requires("openssl/3.2.1", override=True)
160159

161160
def requirements(self):
162161
if self.options.get_safe("with_rs_vulkan", False):
163-
self.requires("vulkan-headers/1.3.239.0", transitive_headers=True)
162+
self.requires("vulkan-headers/1.4.313.0", transitive_headers=True)
164163

165164
if (self.settings.os in ["Macos", "iOS", "tvOS"]):
166-
self.requires("moltenvk/1.2.2", transitive_headers=True)
165+
self.requires("moltenvk/1.3.0", transitive_headers=True)
167166

168167
if self.options.get_safe("with_rs_opengl", False):
169168
self.requires("glbinding/3.3.0", transitive_headers=True)
170169
self.requires("glew/2.2.0", transitive_headers=True)
171170

172171
if self.settings.os in ["Windows"]:
173-
self.requires("wil/1.0.240803.1", transitive_headers=True)
172+
self.requires("wil/1.0.250325.1", transitive_headers=True)
174173

175174
if self.useDate:
176-
self.requires("date/3.0.3", transitive_headers=True)
175+
self.requires("date/3.0.4", transitive_headers=True)
177176

178177
if self.useExpected:
179178
self.requires("tl-expected/20190710", transitive_headers=True)
180179

181180
if self.useFMT:
182-
self.requires("fmt/11.1.4", transitive_headers=True)
181+
self.requires("fmt/11.2.0", transitive_headers=True)
183182

184183
if self.useRanges:
185184
self.requires("range-v3/0.12.0", transitive_headers=True)

libraries/gfx/vulkan/tests/version.tests.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ namespace morpheus::gfx::vulkan {
99

1010
TEST_CASE("Test construction of std::error_code object via make_error_code", "[vulkan.version]")
1111
{
12-
constexpr std::uint8_t expectedVariant = 0;
13-
constexpr std::uint8_t expectedMajor = 1;
14-
constexpr std::uint8_t expectedMinor = 3;
15-
constexpr std::uint8_t expectedPatch = VK_HEADER_VERSION;
12+
constexpr std::uint32_t expectedVariant = 0;
13+
constexpr std::uint32_t expectedMajor = 1;
14+
constexpr std::uint32_t expectedMinor = 3;
15+
constexpr std::uint32_t expectedPatch = VK_HEADER_VERSION;
1616
constexpr Version version(VK_MAKE_API_VERSION(expectedVariant, expectedMajor, expectedMinor, expectedPatch));
1717
STATIC_REQUIRE(version.variant() == expectedVariant);
1818
STATIC_REQUIRE(version.major() == expectedMajor);

0 commit comments

Comments
 (0)