luke
/
openFPGALoader
mirror of https://github.com/trabucayre/openFPGALoader.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmsisDAP: try libhidapi-hidraw, or libhidapi-libusb for backward compatibility

This commit is contained in:
Gwenhael Goavec-Merou 2021-10-14 06:46:59 +02:00
parent 4b3755f368
commit 9cfb070e2f
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@ jobs:
cmake \ cmake \
libftdi1-2 \ libftdi1-2 \
libftdi1-dev \ libftdi1-dev \
libhidapi-libusb0 \ libhidapi-hidraw0 \
libhidapi-dev \ libhidapi-dev \
libudev-dev \ libudev-dev \
pkg-config \ pkg-config \
@ -85,7 +85,7 @@ jobs:
sudo apt update -qq sudo apt update -qq
sudo apt install -y \ sudo apt install -y \
libftdi1-2 \ libftdi1-2 \
libhidapi-libusb0 \ libhidapi-hidraw0 \
udev udev
- name: '📥 Download artifact: package' - name: '📥 Download artifact: package'

6
CMakeLists.txt
View File

@ -36,7 +36,11 @@ if(USE_PKGCONFIG)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(LIBFTDI REQUIRED libftdi1) pkg_check_modules(LIBFTDI REQUIRED libftdi1)
pkg_check_modules(LIBUSB REQUIRED libusb-1.0) pkg_check_modules(LIBUSB REQUIRED libusb-1.0)
pkg_check_modules(HIDAPI hidapi-libusb) pkg_check_modules(HIDAPI hidapi-hidraw)
# if hidraw not found try with libusb
if(NOT HIDAPI_FOUND)
pkg_check_modules(HIDAPI hidapi-libusb)
endif()
if(ENABLE_UDEV) if(ENABLE_UDEV)
pkg_check_modules(LIBUDEV libudev) pkg_check_modules(LIBUDEV libudev)

2
INSTALL.md
View File

@ -24,7 +24,7 @@ sudo dnf install openFPGALoader
This application uses **libftdi1**, so this library must be installed (and, This application uses **libftdi1**, so this library must be installed (and,
depending of the distribution, headers too) depending of the distribution, headers too)
```bash ```bash
apt-get install libftdi1-2 libftdi1-dev libhidapi-libusb0 libhidapi-dev libudev-dev cmake pkg-config make g++ apt-get install libftdi1-2 libftdi1-dev libhidapi-hidraw0 libhidapi-dev libudev-dev cmake pkg-config make g++
``` ```
**libudev-dev** is optional, may be replaced by **eudev-dev** or just not installed. **libudev-dev** is optional, may be replaced by **eudev-dev** or just not installed.