From d9fba75281f8f71d3c442d3e9747f5d0331a778b Mon Sep 17 00:00:00 2001 From: Stephan Soileau Date: Wed, 7 Aug 2024 03:29:02 +0000 Subject: [PATCH 1/4] Add protobuf 26.1 --- cmake/projects/Protobuf/hunter.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/projects/Protobuf/hunter.cmake b/cmake/projects/Protobuf/hunter.cmake index aa79a8d49f..62e7fa0bab 100644 --- a/cmake/projects/Protobuf/hunter.cmake +++ b/cmake/projects/Protobuf/hunter.cmake @@ -203,7 +203,12 @@ hunter_add_version( "https://github.com/stephans/cpp-pm-protobuf/archive/refs/tags/3.19.4-p1.tar.gz" SHA1 40e378d024928efa190e3fd59f66dc6510f79ea6 -) + ) + +hunter_add_version(PACKAGE_NAME Protobuf + VERSION "26.1-p0" + URL "https://github.com/stephans/cpp-pm-protobuf/archive/refs/heads/v26.1-hunter.tar.gz" + SHA1 438776c117b0da986a4ee6610c6f74c34dfdaeb7) hunter_add_version( PACKAGE_NAME From e4fae335c2f4c24bbdf3014bab8ea49822b8cc25 Mon Sep 17 00:00:00 2001 From: Stephan Soileau Date: Wed, 7 Aug 2024 05:11:10 +0000 Subject: [PATCH 2/4] Add new grpc version --- cmake/projects/gRPC/hunter.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmake/projects/gRPC/hunter.cmake b/cmake/projects/gRPC/hunter.cmake index a7f02480be..5ec8c1c293 100644 --- a/cmake/projects/gRPC/hunter.cmake +++ b/cmake/projects/gRPC/hunter.cmake @@ -78,6 +78,12 @@ hunter_add_version( URL "https://github.com/cpp-pm/grpc/archive/refs/tags/v1.44.0-p0.tar.gz" SHA1 "9521efd87a6ea0ca1102bf6e5acff835eecf5841") +hunter_add_version( + PACKAGE_NAME gRPC + VERSION "1.65.3" + URL "https://github.com/stephans/hunter-grpc/archive/refs/tags/v1.65.3-hunter.tar.gz" + SHA1 "a382b84c7455eba50b0b2f2017bdee03e0761fa8") + hunter_cmake_args( gRPC CMAKE_ARGS From 795ff738bcca7d14635f45c1d48c0e7cf09f0060 Mon Sep 17 00:00:00 2001 From: Stephan Soileau Date: Tue, 20 Aug 2024 11:43:46 -0700 Subject: [PATCH 3/4] Add protobuf 26.1-p0 --- cmake/projects/Protobuf/hunter.cmake | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cmake/projects/Protobuf/hunter.cmake b/cmake/projects/Protobuf/hunter.cmake index 62e7fa0bab..f120dc65a2 100644 --- a/cmake/projects/Protobuf/hunter.cmake +++ b/cmake/projects/Protobuf/hunter.cmake @@ -210,6 +210,17 @@ hunter_add_version(PACKAGE_NAME Protobuf URL "https://github.com/stephans/cpp-pm-protobuf/archive/refs/heads/v26.1-hunter.tar.gz" SHA1 438776c117b0da986a4ee6610c6f74c34dfdaeb7) +hunter_add_version( + PACKAGE_NAME + Protobuf + VERSION + "26.1-p0" + URL + "https://github.com/stephans/cpp-pm-protobuf/archive/refs/tags/v26.1-p0-hunter.tar.gz" + SHA1 + 95a0aa5cf7bafc933760727fb921f92fda82a89e +) + hunter_add_version( PACKAGE_NAME Protobuf @@ -221,6 +232,7 @@ hunter_add_version( 7595f3457f332cc3b362d4aa65a3403761fde4fc ) + string( COMPARE EQUAL "${CMAKE_SYSTEM_NAME}" "WindowsStore" _hunter_windows_store ) From 9d0bd81d6be4d72a8fee17b0f7daf1131d663c5f Mon Sep 17 00:00:00 2001 From: Stephan Soileau Date: Tue, 20 Aug 2024 11:47:18 -0700 Subject: [PATCH 4/4] Remove extra protobuf --- cmake/projects/Protobuf/hunter.cmake | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cmake/projects/Protobuf/hunter.cmake b/cmake/projects/Protobuf/hunter.cmake index f120dc65a2..a363964753 100644 --- a/cmake/projects/Protobuf/hunter.cmake +++ b/cmake/projects/Protobuf/hunter.cmake @@ -205,11 +205,6 @@ hunter_add_version( 40e378d024928efa190e3fd59f66dc6510f79ea6 ) -hunter_add_version(PACKAGE_NAME Protobuf - VERSION "26.1-p0" - URL "https://github.com/stephans/cpp-pm-protobuf/archive/refs/heads/v26.1-hunter.tar.gz" - SHA1 438776c117b0da986a4ee6610c6f74c34dfdaeb7) - hunter_add_version( PACKAGE_NAME Protobuf