[merge] Merge pull request #480 from inexorgame/iceflower/fox

[dep] Update dependencies

Author: IAmNotHanni

cmake/conan_setup.cmake

@@ -18,18 +18,17 @@ list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR})
 
 if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
     message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan")
-    file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/1ed947da9c0207b070c7967af1c60da636039c33/conan.cmake"
+    file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/4b01ffd8c058f5784ebf39b9bebab3961be52888/conan.cmake"
         "${CMAKE_BINARY_DIR}/conan.cmake"
-        EXPECTED_HASH SHA256=8e1ae613d112105fcb43f2837fe81d6d08b4619237a8035731afebbea9646e32
+        EXPECTED_HASH SHA256=B48262E9B603378E16E1056E786BF389EB7F2FE2267DACBB41C5A9E33A07E0F1
         TLS_VERIFY ON)
 endif()
 
 include(conan)
 
-conan_check(VERSION 1.35.2 REQUIRED)
+conan_check(VERSION 1.51.0 REQUIRED)
 
-# TODO: cmake-conan v0.17.0 can automatically set the compiler.cppstd propety based on CMAKE_CXX_STANDARD.
-#       We could set this variable globally but it goes against current conventions where the CXX standard is set per target.
+# We could set this variable globally but it goes against current conventions where the CXX standard is set per target.
 get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 # if a specific build type is set ignore the multi config generator
 if(${is_multi_config} AND NOT DEFINED CMAKE_BUILD_TYPE)
@@ -44,7 +43,6 @@ if(${is_multi_config} AND NOT DEFINED CMAKE_BUILD_TYPE)
             OPTIONS build_benchmarks=${benchmark_option}
             OPTIONS build_tests=${tests_option}
             SETTINGS ${conan_settings}
-            SETTINGS compiler.cppstd=20
             ${compiler_libcxx}
         )
     endforeach()
@@ -59,7 +57,6 @@ else()
         OPTIONS build_benchmarks=${benchmark_option}
         OPTIONS build_tests=${tests_option}
         SETTINGS ${conan_settings}
-        SETTINGS compiler.cppstd=20
         ${compiler_libcxx}
     )
     include(conanbuildinfo)

conanfile.py

@@ -10,13 +10,13 @@ class InexorConan(ConanFile):
     )
 
     requires = (
-        "glfw/3.3.2",
+        "glfw/3.3.7",
         "glm/0.9.9.8",
-        "imgui/1.77",
-        "spdlog/1.7.0",
-        "stb/20200203",
-        "tinygltf/2.2.0",
-        "toml11/3.4.0",
+        "imgui/1.88",
+        "spdlog/1.10.0",
+        "stb/cci.20210910",
+        "tinygltf/2.5.0",
+        "toml11/3.7.1",
         "vulkan-memory-allocator/2.3.0",
     )
 
@@ -39,9 +39,9 @@ def configure(self):
 
     def requirements(self):
         if self.options.build_benchmarks:
-            self.requires("benchmark/1.5.2")
+            self.requires("benchmark/1.6.2")
         if self.options.build_tests:
-            self.requires("gtest/1.10.0")
+            self.requires("gtest/1.12.1")
 
     def imports(self):
         # Copies all dll files from packages bin folder to my "bin" folder (win)