macos cmake

Author: scotthart

ci/kokoro/lib/vcpkg.sh

@@ -32,10 +32,10 @@ install_vcpkg() {
   io::log "Downloading vcpkg into ${vcpkg_dir}..."
   VCPKG_VERSION="$(<ci/etc/vcpkg-version.txt)"
   url="https://github.com/microsoft/vcpkg/archive/${VCPKG_VERSION}.tar.gz"
-  if [[ "${VCPKG_VERSION}" =~ [0-9]{4}.[0-9]{2}.[0-9]{2} ]]; then
-    # vcpkg uses date-like tags for releases
-    url="https://github.com/microsoft/vcpkg/archive/refs/tags/${VCPKG_VERSION}.tar.gz"
-  fi
+#  if [[ "${VCPKG_VERSION}" =~ [0-9]{4}.[0-9]{2}.[0-9]{2} ]]; then
+#    # vcpkg uses date-like tags for releases
+#    url="https://github.com/microsoft/vcpkg/archive/refs/tags/${VCPKG_VERSION}.tar.gz"
+#  fi
   ci/retry-command.sh 3 120 curl -fsSL "${url}" |
     tar -C "${vcpkg_dir}" --strip-components=1 -zxf -
 

ci/kokoro/macos/builds/cmake-vcpkg.sh

@@ -84,6 +84,8 @@ cmake_flags=(
   "-DGOOGLE_CLOUD_CPP_ENABLE=universe_domain"
 )
 
+export VCPKG_OVERLAY_PORTS="ci\kokoro\windows\vcpkg-overlays"
+
 # The downloads can fail, therefore require a retry loop.
 io::log_h2 "Download and compile dependencies using vcpkg"
 ci/retry-command.sh 3 120 \