Updated Corrade and Magnum to latest. (#2408)

facebookresearch · Jun 11, 2024 · 8961cb0 · 8961cb0
1 parent d808de4
commit 8961cb0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git 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
diff --git a/src/deps/magnum b/src/deps/magnum
diff --git a/src/deps/magnum-bindings b/src/deps/magnum-bindings
diff --git a/src/deps/magnum-plugins b/src/deps/magnum-plugins