Skip to content

Commit 6f3bb74

Browse files
committed
CI: Use vcpkg's CMake integration to install dependencies.
1 parent 51ed006 commit 6f3bb74

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

.github/workflows/build.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ jobs:
4141
include:
4242
- sys: {os: 'windows', shell: 'pwsh'}
4343
cmake_args: >-
44-
-DCMAKE_PREFIX_PATH=C:/vcpkg/installed/x64-windows
4544
-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
4645
--install-prefix=$env:GITHUB_WORKSPACE/install
4746
- sys: {os: 'windows', shell: 'msys2'}
@@ -75,10 +74,6 @@ jobs:
7574
sudo apt install libfftw3-dev libusb-1.0-0-dev
7675
if: matrix.sys.os == 'ubuntu'
7776

78-
- name: Install dependencies (Windows)
79-
run: vcpkg install --triplet=x64-windows libusb fftw3 pthreads
80-
if: matrix.sys.os == 'windows' && matrix.sys.shell != 'msys2'
81-
8277
- name: Setup MSYS (Windows)
8378
if: matrix.sys.os == 'windows' && matrix.sys.shell == 'msys2'
8479
uses: msys2/setup-msys2@v2

host/libhackrf/vcpkg.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"dependencies": ["libusb", "pthreads"]
3+
}

host/vcpkg.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"dependencies": ["libusb", "fftw3", "pthreads"]
3+
}

0 commit comments

Comments
 (0)