Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update main with v1.30.1 changes #7160

Merged
merged 3 commits into from
Aug 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,16 @@
removed. If your code previously relied on `sor.status() = new_status` you
should change it to `sor = new_status`. ([#7150](https://github.com/googleapis/google-cloud-cpp/pull/7150))

## v1.30.1 - 2021-08

### BigQuery

* Support both google-cloud-cpp::bigquery and deprecated google-cloud-cpp::experimental-bigquery targets.

### IAM

* Support both google-cloud-cpp::iam and deprecated google-cloud-cpp::experimental-iam targets.

## v1.30.0 - 2021-08

### New GA Libraries
Expand Down
5 changes: 0 additions & 5 deletions google/cloud/bigquery/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,6 @@ set_target_properties(
PROPERTIES EXPORT_NAME google-cloud-cpp::bigquery VERSION
"${PROJECT_VERSION}"
SOVERSION "${PROJECT_VERSION_MAJOR}")
set_target_properties(
google_cloud_cpp_bigquery
PROPERTIES EXPORT_NAME google-cloud-cpp::experimental-bigquery
VERSION "${PROJECT_VERSION}" SOVERSION
"${PROJECT_VERSION_MAJOR}")
target_compile_options(google_cloud_cpp_bigquery
PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})

Expand Down
9 changes: 9 additions & 0 deletions google/cloud/bigquery/config.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,12 @@ find_dependency(google_cloud_cpp_grpc_utils)
find_dependency(absl)

include("${CMAKE_CURRENT_LIST_DIR}/google_cloud_cpp_bigquery-targets.cmake")

add_library(google-cloud-cpp::experimental-bigquery IMPORTED INTERFACE)
set_target_properties(google-cloud-cpp::experimental-bigquery PROPERTIES
INTERFACE_LINK_LIBRARIES "google-cloud-cpp::bigquery")
if (CMAKE_VERSION VERSION_GREATER 3.17)
set_target_properties(google-cloud-cpp::experimental-bigquery PROPERTIES
DEPRECATION
"This target will be removed on or about 2021-09-01, please use google-cloud-cpp::bigquery instead")
endif()
6 changes: 0 additions & 6 deletions google/cloud/iam/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,6 @@ set_target_properties(
google_cloud_cpp_iam
PROPERTIES EXPORT_NAME google-cloud-cpp::iam VERSION "${PROJECT_VERSION}"
SOVERSION "${PROJECT_VERSION_MAJOR}")
set_target_properties(
google_cloud_cpp_iam
PROPERTIES EXPORT_NAME google-cloud-cpp::experimental-iam
VERSION "${PROJECT_VERSION}" SOVERSION
"${PROJECT_VERSION_MAJOR}")

target_compile_options(google_cloud_cpp_iam
PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})

Expand Down
9 changes: 9 additions & 0 deletions google/cloud/iam/config.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,12 @@ find_dependency(google_cloud_cpp_grpc_utils)
find_dependency(absl)

include("${CMAKE_CURRENT_LIST_DIR}/google_cloud_cpp_iam-targets.cmake")

add_library(google-cloud-cpp::experimental-iam IMPORTED INTERFACE)
set_target_properties(google-cloud-cpp::experimental-iam PROPERTIES
INTERFACE_LINK_LIBRARIES "google-cloud-cpp::iam")
if (CMAKE_VERSION VERSION_GREATER 3.17)
set_target_properties(google-cloud-cpp::experimental-iam PROPERTIES
DEPRECATION
"This target will be removed on or about 2021-09-01, please use google-cloud-cpp::iam instead")
endif()