From cadf39c3409cced532dae38c803816419de4a425 Mon Sep 17 00:00:00 2001 From: Scott Hart Date: Wed, 11 Dec 2024 12:18:49 -0500 Subject: [PATCH] use experimental target in quickstarts for now --- ci/cloudbuild/builds/quickstart-cmake.sh | 2 -- google/cloud/bigquerycontrol/CMakeLists.txt | 10 ++++------ google/cloud/bigquerycontrol/quickstart/BUILD.bazel | 3 ++- google/cloud/bigquerycontrol/quickstart/CMakeLists.txt | 3 ++- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ci/cloudbuild/builds/quickstart-cmake.sh b/ci/cloudbuild/builds/quickstart-cmake.sh index 2c2b1ca25ea12..fabbbcb02c734 100755 --- a/ci/cloudbuild/builds/quickstart-cmake.sh +++ b/ci/cloudbuild/builds/quickstart-cmake.sh @@ -47,8 +47,6 @@ readonly SED_ARGS=( # The vcpkg maintainers introduced an `rpc` feature to just compile # `grpc-common`. -e '/^rpc$/d' - # TODO(#14891) - skip until next release - -e '/^bigquerycontrol/d' ) mapfile -t features < <( env -C "${vcpkg_dir}" ./vcpkg search google-cloud-cpp | diff --git a/google/cloud/bigquerycontrol/CMakeLists.txt b/google/cloud/bigquerycontrol/CMakeLists.txt index 87b53f7820913..938ef893993cc 100644 --- a/google/cloud/bigquerycontrol/CMakeLists.txt +++ b/google/cloud/bigquerycontrol/CMakeLists.txt @@ -16,15 +16,13 @@ include(GoogleCloudCppLibrary) -google_cloud_cpp_add_gapic_library( - bigquerycontrol "Cloud BigQuery Control API" REST_TRANSPORT - SERVICE_DIRS "v2/") +google_cloud_cpp_add_gapic_library(bigquerycontrol "Cloud BigQuery Control API" + REST_TRANSPORT SERVICE_DIRS "v2/") if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS) add_executable(bigquerycontrol_quickstart "quickstart/quickstart.cc") - target_link_libraries( - bigquerycontrol_quickstart - PRIVATE google-cloud-cpp::bigquerycontrol) + target_link_libraries(bigquerycontrol_quickstart + PRIVATE google-cloud-cpp::bigquerycontrol) google_cloud_cpp_add_common_options(bigquerycontrol_quickstart) add_test( NAME bigquerycontrol_quickstart diff --git a/google/cloud/bigquerycontrol/quickstart/BUILD.bazel b/google/cloud/bigquerycontrol/quickstart/BUILD.bazel index de41bf16487fa..0cddf4846403c 100644 --- a/google/cloud/bigquerycontrol/quickstart/BUILD.bazel +++ b/google/cloud/bigquerycontrol/quickstart/BUILD.bazel @@ -20,6 +20,7 @@ cc_binary( "quickstart.cc", ], deps = [ - "@google_cloud_cpp//:bigquerycontrol", + # TODO(#14891): switch to GA target + "@google_cloud_cpp//:experimental-bigquerycontrol", ], ) diff --git a/google/cloud/bigquerycontrol/quickstart/CMakeLists.txt b/google/cloud/bigquerycontrol/quickstart/CMakeLists.txt index e595057749930..665715bcc9c3b 100644 --- a/google/cloud/bigquerycontrol/quickstart/CMakeLists.txt +++ b/google/cloud/bigquerycontrol/quickstart/CMakeLists.txt @@ -29,4 +29,5 @@ endif () # Define your targets. add_executable(quickstart quickstart.cc) -target_link_libraries(quickstart google-cloud-cpp::bigquerycontrol) +# TODO(#14891): switch to GA target. +target_link_libraries(quickstart google-cloud-cpp::experimental-bigquerycontrol)