Skip to content

Update dependencies #399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Twon merged 3 commits into from
Aug 2, 2025
Merged

Update dependencies #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3bf1a34
Update dependencies
Twon Aug 1, 2025
560ac97
Revert mold upgrade
Twon Aug 2, 2025
31d48f9
Update vulkan version test
Twon Aug 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,42 +144,41 @@ def config_options(self):
self.options.rm_safe("with_rs_direct_x12")

def build_requirements(self):
self.tool_requires("ninja/1.12.1")
self.test_requires("catch2/3.8.0")
self.tool_requires("ninja/1.13.1")
self.test_requires("catch2/3.9.0")
self.test_requires("gtest/1.16.0")

if get_cmake_version() < Version("4.0.1"):
self.tool_requires("cmake/4.0.1")
if get_cmake_version() < Version("4.0.3"):
self.tool_requires("cmake/4.0.3")

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

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

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

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

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

if self.settings.os in ["Windows"]:
self.requires("wil/1.0.240803.1", transitive_headers=True)
self.requires("wil/1.0.250325.1", transitive_headers=True)

if self.useDate:
self.requires("date/3.0.3", transitive_headers=True)
self.requires("date/3.0.4", transitive_headers=True)

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

if self.useFMT:
self.requires("fmt/11.1.4", transitive_headers=True)
self.requires("fmt/11.2.0", transitive_headers=True)

if self.useRanges:
self.requires("range-v3/0.12.0", transitive_headers=True)
Expand Down
8 changes: 4 additions & 4 deletions libraries/gfx/vulkan/tests/version.tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ namespace morpheus::gfx::vulkan {

TEST_CASE("Test construction of std::error_code object via make_error_code", "[vulkan.version]")
{
constexpr std::uint8_t expectedVariant = 0;
constexpr std::uint8_t expectedMajor = 1;
constexpr std::uint8_t expectedMinor = 3;
constexpr std::uint8_t expectedPatch = VK_HEADER_VERSION;
constexpr std::uint32_t expectedVariant = 0;
constexpr std::uint32_t expectedMajor = 1;
constexpr std::uint32_t expectedMinor = 3;
constexpr std::uint32_t expectedPatch = VK_HEADER_VERSION;
constexpr Version version(VK_MAKE_API_VERSION(expectedVariant, expectedMajor, expectedMinor, expectedPatch));
STATIC_REQUIRE(version.variant() == expectedVariant);
STATIC_REQUIRE(version.major() == expectedMajor);
Expand Down
Loading