OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

System : Do not autoinstall vcpkg packages by default (#6876)

Browse Source 
* System : Do not autoinstall vcpkg packages by default

* System : Enable autoinstall of vcpkg for github action
This commit is contained in:
Magne Sjaastad 2020-10-30 10:07:58 -04:00 committed by GitHub
parent fe1bdf365e
commit 15b5aef308
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ResInsightWithCache.yml vendored
View File

@ -123,7 +123,7 @@ jobs:
with: with:
path: ${{ github.workspace }}/ThirdParty/vcpkg/ path: ${{ github.workspace }}/ThirdParty/vcpkg/
# Ensure the cache is invalidated any time vcpkg version changes, or a different set of packages is being used. # 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 - name: Get Python executable path
id: python-path id: python-path
run: echo "::set-output name=PYTHON_EXECUTABLE::$(python -c 'import sys; import pathlib; print (pathlib.PurePath(sys.executable).as_posix())')" 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_ENABLE_GRPC=true
-D RESINSIGHT_GRPC_PYTHON_EXECUTABLE=${{ steps.python-path.outputs.PYTHON_EXECUTABLE }} -D RESINSIGHT_GRPC_PYTHON_EXECUTABLE=${{ steps.python-path.outputs.PYTHON_EXECUTABLE }}
-D RESINSIGHT_GRPC_DOWNLOAD_PYTHON_MODULE=true -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 }} -D CMAKE_TOOLCHAIN_FILE=${{ matrix.config.cmake-toolchain }}
-G Ninja -G Ninja
RESULT_VARIABLE result RESULT_VARIABLE result

2
CMakeLists.txt
View File

@ -21,7 +21,7 @@ SET(BUILD_SHARED_LIBS OFF CACHE BOOL "ERT: Build shared libraries")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") 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) if (VCPKG_AUTO_INSTALL)
include (AutoVcpkg) include (AutoVcpkg)
set (AUTO_VCPKG_ROOT "${CMAKE_SOURCE_DIR}/ThirdParty/vcpkg") set (AUTO_VCPKG_ROOT "${CMAKE_SOURCE_DIR}/ThirdParty/vcpkg")