From 5113375e7cda20be1e08aa9d5bf7d7500094adf1 Mon Sep 17 00:00:00 2001 From: dbolduc Date: Wed, 3 Jul 2024 14:19:54 -0400 Subject: [PATCH] fix demo installs; revert for real --- ci/cloudbuild/builds/demo-install.sh | 1 + ci/verify_current_targets/CMakeLists.txt | 2 +- doc/packaging.md | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ci/cloudbuild/builds/demo-install.sh b/ci/cloudbuild/builds/demo-install.sh index 84b383c179591..baf0e86030c57 100755 --- a/ci/cloudbuild/builds/demo-install.sh +++ b/ci/cloudbuild/builds/demo-install.sh @@ -50,6 +50,7 @@ cmake -S . -B cmake-out \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DBUILD_TESTING=OFF \ + -DGOOGLE_CLOUD_CPP_WITH_MOCKS=OFF \ -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF \ -DGOOGLE_CLOUD_CPP_ENABLE=__ga_libraries__,opentelemetry cmake --build cmake-out -- -j "$(nproc)" diff --git a/ci/verify_current_targets/CMakeLists.txt b/ci/verify_current_targets/CMakeLists.txt index 300deaa445018..83d75f8b5edcb 100644 --- a/ci/verify_current_targets/CMakeLists.txt +++ b/ci/verify_current_targets/CMakeLists.txt @@ -50,7 +50,7 @@ find_package(Threads REQUIRED) include(CTest) function (add_test_case name) - add_executable("${name}" "verify_current_targets.cc") + add_executable("${name}" verify_current_targets.cc) target_link_libraries("${name}" PRIVATE ${ARGN}) add_test(NAME "${name}" COMMAND "${name}") endfunction () diff --git a/doc/packaging.md b/doc/packaging.md index d44128dd3c3df..d1ece86c11d8d 100644 --- a/doc/packaging.md +++ b/doc/packaging.md @@ -228,6 +228,7 @@ cmake -S . -B cmake-out \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DBUILD_TESTING=OFF \ + -DGOOGLE_CLOUD_CPP_WITH_MOCKS=OFF \ -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF \ -DGOOGLE_CLOUD_CPP_ENABLE=__ga_libraries__,opentelemetry cmake --build cmake-out -- -j "$(nproc)" @@ -331,6 +332,7 @@ cmake -S . -B cmake-out \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DBUILD_TESTING=OFF \ + -DGOOGLE_CLOUD_CPP_WITH_MOCKS=OFF \ -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF \ -DGOOGLE_CLOUD_CPP_ENABLE=__ga_libraries__,opentelemetry cmake --build cmake-out -- -j "$(nproc)" @@ -480,6 +482,7 @@ cmake -S . -B cmake-out \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DBUILD_TESTING=OFF \ + -DGOOGLE_CLOUD_CPP_WITH_MOCKS=OFF \ -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF \ -DGOOGLE_CLOUD_CPP_ENABLE=__ga_libraries__,opentelemetry cmake --build cmake-out -- -j "$(nproc)" @@ -594,6 +597,7 @@ cmake -S . -B cmake-out \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DBUILD_TESTING=OFF \ + -DGOOGLE_CLOUD_CPP_WITH_MOCKS=OFF \ -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF \ -DGOOGLE_CLOUD_CPP_ENABLE=__ga_libraries__,opentelemetry cmake --build cmake-out -- -j "$(nproc)" @@ -761,6 +765,7 @@ cmake -S . -B cmake-out \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DBUILD_TESTING=OFF \ + -DGOOGLE_CLOUD_CPP_WITH_MOCKS=OFF \ -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF \ -DGOOGLE_CLOUD_CPP_ENABLE=__ga_libraries__,opentelemetry cmake --build cmake-out -- -j "$(nproc)" @@ -947,6 +952,7 @@ cmake -S . -B cmake-out \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DBUILD_TESTING=OFF \ + -DGOOGLE_CLOUD_CPP_WITH_MOCKS=OFF \ -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF \ -DGOOGLE_CLOUD_CPP_ENABLE=__ga_libraries__,opentelemetry cmake --build cmake-out -- -j "$(nproc)" @@ -1057,6 +1063,7 @@ cmake -S . -B cmake-out \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DBUILD_TESTING=OFF \ + -DGOOGLE_CLOUD_CPP_WITH_MOCKS=OFF \ -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF \ -DGOOGLE_CLOUD_CPP_ENABLE=__ga_libraries__,opentelemetry cmake --build cmake-out -- -j "$(nproc)" @@ -1231,6 +1238,7 @@ cmake -S . -B cmake-out \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DBUILD_TESTING=OFF \ + -DGOOGLE_CLOUD_CPP_WITH_MOCKS=OFF \ -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF \ -DGOOGLE_CLOUD_CPP_ENABLE=__ga_libraries__,opentelemetry cmake --build cmake-out -- -j "$(nproc)" @@ -1452,6 +1460,7 @@ cmake -S . -B cmake-out \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DBUILD_TESTING=OFF \ + -DGOOGLE_CLOUD_CPP_WITH_MOCKS=OFF \ -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF \ -DGOOGLE_CLOUD_CPP_ENABLE=__ga_libraries__,opentelemetry cmake --build cmake-out -- -j "$(nproc)"