[VL] Fix gcs build issue when vcpkg build is enabled (#6343)

apache · Jul 5, 2024 · b94afa6 · b94afa6
1 parent 5f577b4
commit b94afa6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/dev/ci-velox-buildstatic.sh b/dev/ci-velox-buildstatic.sh
@@ -6,4 +6,4 @@ cd $GITHUB_WORKSPACE/
 source ./dev/vcpkg/env.sh
 sed -i '/^headers/d' ep/build-velox/build/velox_ep/CMakeLists.txt
 export NUM_THREADS=4
-./dev/builddeps-veloxbe.sh --build_tests=OFF --build_benchmarks=OFF --enable_s3=ON --enable_gcs=OFF --enable_hdfs=ON --enable_abfs=ON
+./dev/builddeps-veloxbe.sh --build_tests=OFF --build_benchmarks=OFF --enable_s3=ON --enable_gcs=ON --enable_hdfs=ON --enable_abfs=ON
diff --git a/dev/vcpkg/vcpkg-configuration.json b/dev/vcpkg/vcpkg-configuration.json
@@ -8,6 +8,13 @@
       "repository": "https://github.com/Microsoft/vcpkg",
       "baseline": "8ccb84df727bdf83045e53c319af05c554838b80",
       "packages": [ "boost*", "boost-*"]
+    },
+    {
+      "kind": "git",
+      "repository": "https://github.com/Microsoft/vcpkg",
+      "baseline": "f82160a747b1b529daad7ce2f75a0d6c6a0d285d",
+      "packages": [ "google-cloud-cpp"]
     }
+
   ]
-}
+}
diff --git a/dev/vcpkg/vcpkg.json b/dev/vcpkg/vcpkg.json
@@ -76,7 +76,8 @@
           "name": "google-cloud-cpp",
           "features": [
             "storage"
-          ]
+          ],
+          "version>=": "2.22.0"
         }
       ]
     },