diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake index 8d5a1b0..b52a36a 100644 --- a/cmake/abseil-cpp.cmake +++ b/cmake/abseil-cpp.cmake @@ -14,7 +14,7 @@ FetchContent_Declare(absl GIT_REPOSITORY https://github.com/abseil/abseil-cpp - GIT_TAG 3dccef2a91243460364312d3e1100ff1d573fb1d # 2022-04-20 + GIT_TAG ab2e2c4f6062999afaf960759dfccb77f350c702 # 2022-09-15 ) set(ABSL_CXX_STANDARD ${SAPI_CXX_STANDARD} CACHE STRING "" FORCE) set(ABSL_PROPAGATE_CXX_STD ON CACHE BOOL "" FORCE) diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake index 2abbca5..7821b82 100644 --- a/cmake/protobuf.cmake +++ b/cmake/protobuf.cmake @@ -14,21 +14,16 @@ FetchContent_Declare(protobuf GIT_REPOSITORY https://github.com/protocolbuffers/protobuf.git - GIT_TAG v3.15.8 # 2021-04-08 - GIT_SUBMODULES "cmake" # Workaround for CMake #20579 - SOURCE_SUBDIR cmake + GIT_TAG v3.21.6 # 2022-09-14 ) +set(protobuf_ABSL_PROVIDER "package" CACHE STRING "" FORCE) set(protobuf_BUILD_TESTS OFF CACHE BOOL "" FORCE) set(protobuf_BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE) +set(protobuf_INSTALL OFF CACHE BOOL "" FORCE) set(protobuf_WITH_ZLIB OFF CACHE BOOL "" FORCE) -FetchContent_GetProperties(protobuf) -if(NOT protobuf_POPULATED) - FetchContent_Populate(protobuf) - add_subdirectory("${protobuf_SOURCE_DIR}/cmake" - "${protobuf_BINARY_DIR}") -endif() +FetchContent_MakeAvailable(protobuf) sapi_check_target(protobuf::libprotobuf) sapi_check_target(protobuf::protoc) diff --git a/sandboxed_api/bazel/sapi_deps.bzl b/sandboxed_api/bazel/sapi_deps.bzl index 2cb28bb..646eba6 100644 --- a/sandboxed_api/bazel/sapi_deps.bzl +++ b/sandboxed_api/bazel/sapi_deps.bzl @@ -37,9 +37,9 @@ def sapi_deps(): maybe( http_archive, name = "com_google_absl", - sha256 = "1a87de20498817e4a8b9f146214bb92d0cb17b7ad8a65678eada7b78ec900e14", # 2022-04-20 - strip_prefix = "abseil-cpp-3dccef2a91243460364312d3e1100ff1d573fb1d", - urls = ["https://github.com/abseil/abseil-cpp/archive/3dccef2a91243460364312d3e1100ff1d573fb1d.zip"], + sha256 = "ef76248ccea6dd05762cfdc9a5b234222e1f3b38d31325e35d4172559eac7935", # 2022-09-15 + strip_prefix = "abseil-cpp-ab2e2c4f6062999afaf960759dfccb77f350c702", + urls = ["https://github.com/abseil/abseil-cpp/archive/ab2e2c4f6062999afaf960759dfccb77f350c702.zip"], ) maybe( http_archive, @@ -83,9 +83,9 @@ def sapi_deps(): maybe( http_archive, name = "com_google_protobuf", - sha256 = "dd513a79c7d7e45cbaeaf7655289f78fd6b806e52dbbd7018ef4e3cf5cff697a", # 2021-04-08 - strip_prefix = "protobuf-3.15.8", - urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.15.8.zip"], + sha256 = "0ac0d92cba957fdfc77cab689ffc56d52ce2ff89ebcc384e4e682e6f9d218071", # 2022-09-14 + strip_prefix = "protobuf-3.21.6", + urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.21.6.zip"], ) # libcap