From ec173015480370e070e35d007d7f4ddbac037942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 11 Jun 2024 19:46:00 +0200 Subject: [PATCH] Updated Corrade and Magnum to latest. --- src/cmake/FindGLFW.cmake | 4 +++- src/deps/corrade | 2 +- src/deps/magnum | 2 +- src/deps/magnum-bindings | 2 +- src/deps/magnum-plugins | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/cmake/FindGLFW.cmake b/src/cmake/FindGLFW.cmake index 1d383cc120..8cf9a54bc7 100644 --- a/src/cmake/FindGLFW.cmake +++ b/src/cmake/FindGLFW.cmake @@ -87,7 +87,9 @@ if(CORRADE_TARGET_WINDOWS) set(_GLFW_LIBRARY_PATH_SUFFIX lib-vc2017) elseif(MSVC_VERSION VERSION_LESS 1930) set(_GLFW_LIBRARY_PATH_SUFFIX lib-vc2019) - elseif(MSVC_VERSION VERSION_LESS 1940) + # MSVC 2022 17.10 overflowed the 1930 range to 1940, so assume a + # hypothetical MSVC 2025 will start with 1950. + elseif(MSVC_VERSION VERSION_LESS 1950) set(_GLFW_LIBRARY_PATH_SUFFIX lib-vc2022) else() message(FATAL_ERROR "Unsupported MSVC version") diff --git a/src/deps/corrade b/src/deps/corrade index 295bbba1f4..2ad1cc8f2c 160000 --- a/src/deps/corrade +++ b/src/deps/corrade @@ -1 +1 @@ -Subproject commit 295bbba1f49887da060465f88b8501965f6acd7d +Subproject commit 2ad1cc8f2c68a1419056f3ba784daec1145dc1fa diff --git a/src/deps/magnum b/src/deps/magnum index 8538610fa2..c0e15614ea 160000 --- a/src/deps/magnum +++ b/src/deps/magnum @@ -1 +1 @@ -Subproject commit 8538610fa27e1db37070eaabe34f1e4e41648bab +Subproject commit c0e15614eafd7ab5feeaca33699d841a7ab1ed0c diff --git a/src/deps/magnum-bindings b/src/deps/magnum-bindings index a775640b02..f8cfff614f 160000 --- a/src/deps/magnum-bindings +++ b/src/deps/magnum-bindings @@ -1 +1 @@ -Subproject commit a775640b027b1b541bd682300c1fe69d7f816a61 +Subproject commit f8cfff614f0b92ffd3ffde62b97a29d478c1bf92 diff --git a/src/deps/magnum-plugins b/src/deps/magnum-plugins index 4a6add2096..a79442bb81 160000 --- a/src/deps/magnum-plugins +++ b/src/deps/magnum-plugins @@ -1 +1 @@ -Subproject commit 4a6add209667a32061c535eba7f8aa908dd7fc81 +Subproject commit a79442bb817e20c18d3139e42bd0c2871bbf8fe4