diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3597752..335b545 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,13 +1,12 @@ -{% set name = "google-cloud-cpp" %} -{% set version = "2.9.1" %} +{% set version = "2.10.0" %} package: - name: {{ name|lower }}-split + name: google-cloud-cpp-split version: {{ version }} source: - url: https://github.com/googleapis/{{ name }}/archive/v{{ version }}.tar.gz - sha256: e63d49799eadca7f27c1d7192668ee7cc7fa7dad478c03868d1ce54d662d6ea9 + url: https://github.com/googleapis/google-cloud-cpp/archive/v{{ version }}.tar.gz + sha256: c4aed782cf1241682fc21f143ea81c77438bffcb60b9374f48fc066b1b2fdb4f patches: # Several libraries do not compile under Conda. Depending on the platform # and compiler, they need a newer version of Protobuf. That is, they @@ -16,7 +15,7 @@ source: # https://github.com/googleapis/google-cloud-cpp/issues/8125 # https://github.com/googleapis/google-cloud-cpp/issues/8145 # https://github.com/googleapis/google-cloud-cpp/issues/8785 - - 0001-disable-libraries.patch + - patches/0001-disable-libraries.patch build: number: 0 @@ -40,7 +39,7 @@ requirements: outputs: - name: libgoogle-cloud - script: build-libgoogle-cloud.sh # [not win] + script: build-libgoogle-cloud.sh # [unix] script: build-libgoogle-cloud.bat # [win] build: run_exports: @@ -82,8 +81,9 @@ outputs: #- if not exist %LIBRARY_PREFIX%\\bin\\libgoogle_cloud_cpp_bigtable.dll exit 1 # [win] - if exist %LIBRARY_PREFIX%\\lib\\cmake\\google_cloud_cpp_bigtable\\google_cloud_cpp_bigtable-config.cmake exit 1 # [win] - if exist %LIBRARY_PREFIX%\\include\\google\\cloud\\bigtable\\version.h exit 1 # [win] + - name: google-cloud-cpp - script: build-libgoogle-cloud.sh # [not win] + script: build-libgoogle-cloud.sh # [unix] script: build-libgoogle-cloud.bat # [win] build: run_exports: @@ -113,7 +113,7 @@ outputs: - zlib test: commands: - - ./run_test_google_cloud_cpp.sh # [not win] + - ./run_test_google_cloud_cpp.sh # [unix] - ./run_test_google_cloud_cpp.bat # [win] - test -f $PREFIX/lib/cmake/google_cloud_cpp_storage/google_cloud_cpp_storage-config.cmake # [not win] - test -f $PREFIX/include/google/cloud/storage/version.h # [not win] diff --git a/recipe/0001-disable-libraries.patch b/recipe/patches/0001-disable-libraries.patch similarity index 64% rename from recipe/0001-disable-libraries.patch rename to recipe/patches/0001-disable-libraries.patch index 6e6fab7..525560c 100644 --- a/recipe/0001-disable-libraries.patch +++ b/recipe/patches/0001-disable-libraries.patch @@ -1,8 +1,17 @@ +From 20b43fdb677ea76cfcbdf0e4f000158fe99f615d Mon Sep 17 00:00:00 2001 +From: Carlos O'Ryan +Date: Tue, 7 Feb 2023 01:35:26 +0000 +Subject: [PATCH] disable libraries + +--- + cmake/GoogleCloudCppFeatures.cmake | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + diff --git a/cmake/GoogleCloudCppFeatures.cmake b/cmake/GoogleCloudCppFeatures.cmake -index cf2d9bc8e..9060937f4 100644 +index 1a08f39f7d..359c6d643b 100644 --- a/cmake/GoogleCloudCppFeatures.cmake +++ b/cmake/GoogleCloudCppFeatures.cmake -@@ -42,7 +42,7 @@ set(GOOGLE_CLOUD_CPP_GA_LIBRARIES +@@ -41,7 +41,7 @@ set(GOOGLE_CLOUD_CPP_GA_LIBRARIES "apigeeconnect" "appengine" "artifactregistry" @@ -19,11 +28,11 @@ index cf2d9bc8e..9060937f4 100644 + # "channel" -- needs newer Protobuf https://github.com/googleapis/google-cloud-cpp/issues/8125 "cloudbuild" "composer" - "connectors" -@@ -115,7 +115,7 @@ set(GOOGLE_CLOUD_CPP_GA_LIBRARIES - "spanner" + "confidentialcomputing" +@@ -117,7 +117,7 @@ set(GOOGLE_CLOUD_CPP_GA_LIBRARIES "speech" "storage" + "storageinsights" - "storagetransfer" + # "storagetransfer" -- needs newer Protobuf https://github.com/googleapis/google-cloud-cpp/issues/8785 "talent"