From 5fc394695ba5daa917d0410d13d334ffc4775a16 Mon Sep 17 00:00:00 2001 From: Dennis Ameling Date: Fri, 8 Jan 2021 23:49:21 +0100 Subject: [PATCH 1/2] cmake(install): include vcpkg dlls Signed-off-by: Dennis Ameling --- contrib/buildsystems/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt index c70e2c10632594..30ae317dafeeb5 100644 --- a/contrib/buildsystems/CMakeLists.txt +++ b/contrib/buildsystems/CMakeLists.txt @@ -58,6 +58,10 @@ if(WIN32) # In the vcpkg edition, we need this to be able to link to libcurl set(CURL_NO_CURL_CMAKE ON) + + # Copy the necessary vcpkg DLLs (like iconv) to the install dir + set(X_VCPKG_APPLOCAL_DEPS_INSTALL ON) + set(CMAKE_TOOLCHAIN_FILE ${VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake CACHE STRING "Vcpkg toolchain file") endif() find_program(SH_EXE sh PATHS "C:/Program Files/Git/bin") From dcc809b590a070b13973f5fc3ae5586e48aafcd4 Mon Sep 17 00:00:00 2001 From: Dennis Ameling Date: Tue, 12 Jan 2021 12:26:16 +0100 Subject: [PATCH 2/2] GitHub Actions: Add vcpkg initialization step This commit adds a step called "initialize vcpkg" to the GitHub Actions workflow, because we need some build scripts from vcpkg that aren't present in our vcpkg artifacts from Azure Pipelines. Signed-off-by: Dennis Ameling --- .github/workflows/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b8d5b1b300ed15..c66dbe5f26adcf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -163,6 +163,7 @@ jobs: vs-build: needs: ci-config if: needs.ci-config.outputs.enabled == 'yes' + timeout-minutes: 15 env: MSYSTEM: MINGW64 NO_PERL: 1 @@ -188,6 +189,11 @@ jobs: ## Unzip and remove the artifact unzip artifacts.zip rm artifacts.zip + - name: initialize vcpkg + uses: actions/checkout@v2 + with: + repository: 'microsoft/vcpkg' + path: 'compat/vcbuild/vcpkg' - name: download vcpkg artifacts shell: powershell run: |