From d25265d63a941900a6ca16961f9431d840ba3010 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 27 Jul 2020 22:06:08 -0400 Subject: [PATCH 1/4] CMakeFiles: Update json to 3.8.0 Keeps the tracked version of the library up to date. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a49318aa..7628b2ae5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -165,7 +165,7 @@ macro(yuzu_find_packages) # can't use until https://github.com/bincrafters/community/issues/1173 #"libzip 1.5 libzip/1.5.2@bincrafters/stable" "lz4 1.8 lz4/1.9.2" - "nlohmann_json 3.7 nlohmann_json/3.7.3" + "nlohmann_json 3.8 nlohmann_json/3.8.0" "ZLIB 1.2 zlib/1.2.11" "zstd 1.4 zstd/1.4.4" ) From 5b785232de7eb9fc8064a0050cd371b5f310f43c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 27 Jul 2020 22:07:31 -0400 Subject: [PATCH 2/4] CMakeLists: Update zstd to 1.4.5 Keeps the library version up to date. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7628b2ae5..09f0f908a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -167,7 +167,7 @@ macro(yuzu_find_packages) "lz4 1.8 lz4/1.9.2" "nlohmann_json 3.8 nlohmann_json/3.8.0" "ZLIB 1.2 zlib/1.2.11" - "zstd 1.4 zstd/1.4.4" + "zstd 1.4 zstd/1.4.5" ) foreach(PACKAGE ${REQUIRED_LIBS}) From 6bb77b06dcea1202a5f56a79e0344c533548c48f Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 27 Jul 2020 22:09:02 -0400 Subject: [PATCH 3/4] CMakeLists: Update catch to 2.13 Keeps the library up to date --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 09f0f908a..85afdb9d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -160,7 +160,7 @@ macro(yuzu_find_packages) set(REQUIRED_LIBS # Cmake Pkg Prefix Version Conan Pkg "Boost 1.71 boost/1.72.0" - "Catch2 2.11 catch2/2.11.0" + "Catch2 2.13 catch2/2.13.0" "fmt 7.0 fmt/7.0.1" # can't use until https://github.com/bincrafters/community/issues/1173 #"libzip 1.5 libzip/1.5.2@bincrafters/stable" From 2e6828221494073f5315cec8cbb0a7816fdd6f2c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 27 Jul 2020 22:09:59 -0400 Subject: [PATCH 4/4] CMakeLists: Update boost to 1.73 Keeps the library up to date. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 85afdb9d9..3282ae9d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -159,7 +159,7 @@ macro(yuzu_find_packages) # Capitalization matters here. We need the naming to match the generated paths from Conan set(REQUIRED_LIBS # Cmake Pkg Prefix Version Conan Pkg - "Boost 1.71 boost/1.72.0" + "Boost 1.73 boost/1.73.0" "Catch2 2.13 catch2/2.13.0" "fmt 7.0 fmt/7.0.1" # can't use until https://github.com/bincrafters/community/issues/1173