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.

Sign up for GitHub

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

feat(bigtable): install mocks library #13551

Merged
merged 2 commits into from
Feb 5, 2024
Merged

feat(bigtable): install mocks library #13551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6708f42
feat(bigtable): install mocks library
dbolduc Feb 4, 2024
33f7be1
uh, idgi
dbolduc Feb 4, 2024
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
1 change: 1 addition & 0 deletions ci/etc/expected_install_directories
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1228,6 +1228,7 @@
./lib64/cmake/google_cloud_cpp_bigquery
./lib64/cmake/google_cloud_cpp_bigquery_mocks
./lib64/cmake/google_cloud_cpp_bigtable
./lib64/cmake/google_cloud_cpp_bigtable_mocks
./lib64/cmake/google_cloud_cpp_billing
./lib64/cmake/google_cloud_cpp_billing_mocks
./lib64/cmake/google_cloud_cpp_binaryauthorization
Expand Down
1 change: 1 addition & 0 deletions ci/verify_current_targets/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ set(ga_libraries
# cmake-format: sort
bigquery
bigtable
bigtable_mocks
iam
iam_mocks
logging
Expand Down
12 changes: 4 additions & 8 deletions generator/standalone_main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include "generator/internal/scaffold_generator.h"
#include "google/cloud/internal/absl_str_cat_quiet.h"
#include "google/cloud/internal/absl_str_join_quiet.h"
#include "google/cloud/internal/algorithm.h"
#include "google/cloud/log.h"
#include "google/cloud/status_or.h"
#include "absl/flags/flag.h"
Expand Down Expand Up @@ -167,13 +166,10 @@ int WriteInstallDirectories(
}
auto const lib = LibraryName(product_path);
install_directories.push_back("./lib64/cmake/google_cloud_cpp_" + lib);
// TODO(#5782) - install mocks in libs with handwritten CMakeLists.txt
auto const handwritten_cmake = std::set<std::string>{{
"bigtable",
"compute",
"storage",
}};
if (!google::cloud::internal::Contains(handwritten_cmake, lib)) {
// Note that storage does not have a public-facing mocks library. Only
// GCS+gRPC does.
// TODO(#5782) - install mocks for compute
if (lib != "compute" && lib != "storage") {
install_directories.push_back("./lib64/cmake/google_cloud_cpp_" + lib +
"_mocks");
}
Expand Down
4 changes: 2 additions & 2 deletions google/cloud/bigtable/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,8 +512,6 @@ install(

google_cloud_cpp_install_headers("google_cloud_cpp_bigtable"
"include/google/cloud/bigtable")
google_cloud_cpp_install_headers("google_cloud_cpp_bigtable_mocks"
"include/google/cloud/bigtable")

google_cloud_cpp_add_pkgconfig(
bigtable
Expand All @@ -537,3 +535,5 @@ install(
"${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_bigtable-config-version.cmake"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/google_cloud_cpp_bigtable"
COMPONENT google_cloud_cpp_development)

google_cloud_cpp_install_mocks(bigtable "Google Cloud Bigtable")
Loading