From 15b5aef30874bbe8a6bd3e32b79fa61afaa80ade Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Fri, 30 Oct 2020 10:07:58 -0400
Subject: [PATCH] System : Do not autoinstall vcpkg packages by default (#6876)

* System : Do not autoinstall vcpkg packages by default

* System : Enable autoinstall of vcpkg for github action
---
 .github/workflows/ResInsightWithCache.yml | 4 ++--
 CMakeLists.txt                            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ResInsightWithCache.yml b/.github/workflows/ResInsightWithCache.yml
index 61af91f757..daa3d5ccd0 100644
--- a/.github/workflows/ResInsightWithCache.yml
+++ b/.github/workflows/ResInsightWithCache.yml
@@ -123,7 +123,7 @@ jobs:
         with:
           path: ${{ github.workspace }}/ThirdParty/vcpkg/
           # Ensure the cache is invalidated any time vcpkg version changes, or a different set of packages is being used.
-          key: ${{ hashFiles('.git/modules/ThirdParty/vcpkg/HEAD') }}-${{ runner.os }}-vcpkg-v03
+          key: ${{ hashFiles('.git/modules/ThirdParty/vcpkg/HEAD') }}-${{ runner.os }}-vcpkg-v04
       - name: Get Python executable path
         id: python-path
         run: echo "::set-output name=PYTHON_EXECUTABLE::$(python -c 'import sys; import pathlib; print (pathlib.PurePath(sys.executable).as_posix())')"
@@ -171,7 +171,7 @@ jobs:
               -D RESINSIGHT_ENABLE_GRPC=true
               -D RESINSIGHT_GRPC_PYTHON_EXECUTABLE=${{ steps.python-path.outputs.PYTHON_EXECUTABLE }}
               -D RESINSIGHT_GRPC_DOWNLOAD_PYTHON_MODULE=true
-              -D VCPKG_TARGET_TRIPLET=${{ matrix.config.vcpkg-triplet }}
+              -D VCPKG_AUTO_INSTALL=true
               -D CMAKE_TOOLCHAIN_FILE=${{ matrix.config.cmake-toolchain }}
               -G Ninja
             RESULT_VARIABLE result
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c442edf581..e1c43d5e31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ SET(BUILD_SHARED_LIBS OFF CACHE BOOL "ERT: Build shared libraries")
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
-option(VCPKG_AUTO_INSTALL "Automatically download build pre-requisites with VCPKG" ON)
+option(VCPKG_AUTO_INSTALL "Automatically download build pre-requisites with VCPKG" OFF)
 if (VCPKG_AUTO_INSTALL)
     include (AutoVcpkg)
     set (AUTO_VCPKG_ROOT "${CMAKE_SOURCE_DIR}/ThirdParty/vcpkg")