From 1a3985ec9369cd4fec38e294572941ac0ab01324 Mon Sep 17 00:00:00 2001 From: Tom Atkinson Date: Mon, 11 Mar 2024 00:18:50 +0000 Subject: [PATCH] fix windows vcpkg --- .github/workflows/linux.yml | 2 +- cmake/vendor.cmake | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 8fbd272b..66a87089 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -31,7 +31,7 @@ jobs: - name: Install Windows Dependencies if: startsWith(matrix.os, 'windows') - run: vcpkg integrate install + run: ./vcpkg/install_vcpkg_dependencies.bat - name: Install MacOS Dependencies if: startsWith(matrix.os, 'macos') diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake index 2760256d..b91eab50 100644 --- a/cmake/vendor.cmake +++ b/cmake/vendor.cmake @@ -3,6 +3,10 @@ set (ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../") +if (EXISTS ${ROOT_DIR}/vcpkg_installed/x64-windows-static/lib/pkgconfig) + set(ENV{PKG_CONFIG_PATH} "${ROOT_DIR}/vcpkg_installed/x64-windows-static/lib/pkgconfig") +endif() + # Dependencies are taken from the system first and if not found, they are pulled with CPM and built from source include(FindPkgConfig)