From a0eb24061f3850824eaba4b9e8c627aa2b4257ff Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Wed, 16 Oct 2024 11:10:45 -0700 Subject: [PATCH] Replace use of C++17 with disabling a warning PiperOrigin-RevId: 686572636 --- .github/workflows/test_cpp.yml | 3 ++- cmake/dependencies.cmake | 34 ---------------------------------- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 cmake/dependencies.cmake diff --git a/.github/workflows/test_cpp.yml b/.github/workflows/test_cpp.yml index 2e8d11af83..e9ab589a10 100644 --- a/.github/workflows/test_cpp.yml +++ b/.github/workflows/test_cpp.yml @@ -45,7 +45,8 @@ jobs: cache_key: Bazel7 image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-cf84e92285ca133b9c8104ad7b14d70e953cbb8e" targets: "//src/... //third_party/utf8_range/..." - - config: { name: "Bazel7 with Bzlmod", flags: --enable_bzlmod --enable_workspace --cxxopt=-std=c++17 --host_cxxopt=-std=c++17 --cxxopt="-Wno-self-assign-overloaded" } + # TODO: remove -Wno-unreachable-code" when dropping C++14 + - config: { name: "Bazel7 with Bzlmod", flags: --enable_bzlmod --enable_workspace --per_file_copt=.*/absl/strings/string_view.h@-Wno-unreachable-code --cxxopt="-Wno-self-assign-overloaded" } cache_key: Bazel7bzlmod image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-cf84e92285ca133b9c8104ad7b14d70e953cbb8e" targets: "//src/... //third_party/utf8_range/..." diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake deleted file mode 100644 index e806f5dd8a..0000000000 --- a/cmake/dependencies.cmake +++ /dev/null @@ -1,34 +0,0 @@ -# Auto-generated by @//cmake:make_dependencies -# -# This file contains lists of external dependencies based on our Bazel -# config. It should be included from a hand-written CMake file that uses -# them. -# -# Changes to this file will be overwritten based on Bazel definitions. - -if(${CMAKE_VERSION} VERSION_GREATER 3.10 OR ${CMAKE_VERSION} VERSION_EQUAL 3.10) - include_guard() -endif() - -set(abseil-cpp-version "20230802.1") -set(bazel_skylib-version "1.7.0") -set(jsoncpp-version "1.9.5") -set(rules_cc-version "0.0.13") -set(rules_fuzzing-version "0.5.2") -set(rules_java-version "7.11.1") -set(rules_jvm_external-version "6.3") -set(rules_kotlin-version "1.9.6") -set(rules_license-version "1.0.0") -set(rules_pkg-version "1.0.1") -set(rules_python-version "0.28.0") -set(rules_rust-version "0.51.0") -set(platforms-version "0.0.8") -set(zlib-version "1.3.1") -set(bazel_features-version "1.17.0") -set(rules_shell-version "0.2.0") -set(googletest-version "1.14.0") -set(rules_buf-version "0.3.0") -set(rules_testing-version "0.6.0") -set(rules_proto-version "4.0.0") - -