Skip to content

Trying to reduce the number of settings to pass to CMake #1598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
martinling wants to merge 3 commits into
base: main
Choose a base branch
from
+17 −6
Draft

Trying to reduce the number of settings to pass to CMake #1598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3c5136
Add libusb-1.0 to PATH_SUFFIXES.
martinling Oct 15, 2025
51ed006
CI: Don't use pkg-config on Windows.
martinling Oct 13, 2025
38889d3
CI: Use vcpkg's CMake integration to install dependencies.
martinling Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ jobs:
include:
- sys: {os: 'windows', shell: 'pwsh'}
cmake_args: >-
-DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe
-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
--install-prefix=$env:GITHUB_WORKSPACE/install
- sys: {os: 'windows', shell: 'msys2'}
Expand Down Expand Up @@ -75,10 +74,6 @@ jobs:
sudo apt install libfftw3-dev libusb-1.0-0-dev
if: matrix.sys.os == 'ubuntu'

- name: Install dependencies (Windows)
run: vcpkg install --triplet=x64-windows libusb fftw3 pthreads pkgconf
if: matrix.sys.os == 'windows' && matrix.sys.shell != 'msys2'

- name: Setup MSYS (Windows)
if: matrix.sys.os == 'windows' && matrix.sys.shell == 'msys2'
uses: msys2/setup-msys2@v2
Expand Down Expand Up @@ -132,6 +127,15 @@ jobs:
cd host/hackrf-tools/build
cmake .. -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_args }}
cmake --build . --config Release
if: matrix.sys.shell != 'pwsh'

- name: Configure & Build (hackrf-tools, vcpkg)
run: |
cmake -E make_directory host/hackrf-tools/build
cd host/hackrf-tools/build
cmake .. -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_args }} -DCMAKE_PREFIX_PATH=$env:GITHUB_WORKSPACE/install
cmake --build . --config Release
if: matrix.sys.shell == 'pwsh'

- name: Install (hackrf-tools)
run: |
Expand Down
3 changes: 2 additions & 1 deletion host/cmake/modules/FindLIBUSB.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ else(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
endif()

find_path(LIBUSB_INCLUDE_DIR libusb.h PATHS ${PC_LIBUSB_INCLUDEDIR}
${PC_LIBUSB_INCLUDE_DIRS})
${PC_LIBUSB_INCLUDE_DIRS}
PATH_SUFFIXES libusb-1.0)

find_library(
LIBUSB_LIBRARIES
Expand Down
3 changes: 3 additions & 0 deletions host/libhackrf/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"dependencies": ["libusb", "pthreads"]
}
3 changes: 3 additions & 0 deletions host/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"dependencies": ["libusb", "fftw3", "pthreads"]
}
Loading