From 530aee990edc6af7ceb332c6f4d3cbaa46b62122 Mon Sep 17 00:00:00 2001 From: Scott Hart Date: Wed, 4 Dec 2024 16:32:48 -0500 Subject: [PATCH 1/3] ci: disable deprecated warnings for windows GHA builds --- ci/gha/builds/windows-cmake.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/gha/builds/windows-cmake.sh b/ci/gha/builds/windows-cmake.sh index 674b7202e7000..5a78c304b238a 100755 --- a/ci/gha/builds/windows-cmake.sh +++ b/ci/gha/builds/windows-cmake.sh @@ -52,6 +52,8 @@ fi # [2]: https://stackoverflow.com/questions/3775406 args+=("-DCMAKE_EXE_LINKER_FLAGS=/MANIFEST:NO") +args+=("-DCMAKE_CXX_FLAGS=/wd4996") + io::log_h1 "Starting Build" TIMEFORMAT="==> 🕑 CMake configuration done in %R seconds" time { From 1dd89ad0dcbf904bf71de6f740b4e37b90186597 Mon Sep 17 00:00:00 2001 From: Scott Hart Date: Wed, 4 Dec 2024 16:42:14 -0500 Subject: [PATCH 2/3] add space --- ci/gha/builds/windows-cmake.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/gha/builds/windows-cmake.sh b/ci/gha/builds/windows-cmake.sh index 5a78c304b238a..ee9ee09abf95b 100755 --- a/ci/gha/builds/windows-cmake.sh +++ b/ci/gha/builds/windows-cmake.sh @@ -52,7 +52,7 @@ fi # [2]: https://stackoverflow.com/questions/3775406 args+=("-DCMAKE_EXE_LINKER_FLAGS=/MANIFEST:NO") -args+=("-DCMAKE_CXX_FLAGS=/wd4996") +args+=("-DCMAKE_CXX_FLAGS= /wd4996") io::log_h1 "Starting Build" TIMEFORMAT="==> 🕑 CMake configuration done in %R seconds" From a9091eed87363cdca73e13a86301aa342117146e Mon Sep 17 00:00:00 2001 From: Scott Hart Date: Wed, 4 Dec 2024 17:03:07 -0500 Subject: [PATCH 3/3] different approach --- ci/gha/builds/windows-cmake.sh | 2 -- cmake/GoogleCloudCppCommonOptions.cmake | 1 + google/cloud/bigtable/test_proxy/BUILD.bazel | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ci/gha/builds/windows-cmake.sh b/ci/gha/builds/windows-cmake.sh index ee9ee09abf95b..674b7202e7000 100755 --- a/ci/gha/builds/windows-cmake.sh +++ b/ci/gha/builds/windows-cmake.sh @@ -52,8 +52,6 @@ fi # [2]: https://stackoverflow.com/questions/3775406 args+=("-DCMAKE_EXE_LINKER_FLAGS=/MANIFEST:NO") -args+=("-DCMAKE_CXX_FLAGS= /wd4996") - io::log_h1 "Starting Build" TIMEFORMAT="==> 🕑 CMake configuration done in %R seconds" time { diff --git a/cmake/GoogleCloudCppCommonOptions.cmake b/cmake/GoogleCloudCppCommonOptions.cmake index de3a693c8cdfc..08673db1ffbed 100644 --- a/cmake/GoogleCloudCppCommonOptions.cmake +++ b/cmake/GoogleCloudCppCommonOptions.cmake @@ -80,6 +80,7 @@ function (google_cloud_cpp_add_common_options target) return() endif () target_compile_options(${target} PRIVATE "/W3") + target_compile_options(${target} PRIVATE "/wd4996") if (GOOGLE_CLOUD_CPP_ENABLE_WERROR) target_compile_options(${target} PRIVATE "/WX") endif () diff --git a/google/cloud/bigtable/test_proxy/BUILD.bazel b/google/cloud/bigtable/test_proxy/BUILD.bazel index c3ad1602b5b1c..c3b6490e7da97 100644 --- a/google/cloud/bigtable/test_proxy/BUILD.bazel +++ b/google/cloud/bigtable/test_proxy/BUILD.bazel @@ -22,7 +22,6 @@ cc_library( testonly = True, srcs = ["cbt_test_proxy.cc"], hdrs = ["cbt_test_proxy.h"], - copts = ["-Wno-deprecated-declarations"], deps = [ "//:bigtable", "//protos:system_includes",