From 9cfb070e2fa7d20e4687adbe5b64dc04f1d7fc8e Mon Sep 17 00:00:00 2001
From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
Date: Thu, 14 Oct 2021 06:46:59 +0200
Subject: [PATCH] cmsisDAP: try libhidapi-hidraw, or libhidapi-libusb for
 backward compatibility

---
 .github/workflows/Test.yml | 4 ++--
 CMakeLists.txt             | 6 +++++-
 INSTALL.md                 | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index 5cd874f..1eb3d7c 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -30,7 +30,7 @@ jobs:
           cmake \
           libftdi1-2 \
           libftdi1-dev \
-          libhidapi-libusb0 \
+          libhidapi-hidraw0 \
           libhidapi-dev \
           libudev-dev \
           pkg-config \
@@ -85,7 +85,7 @@ jobs:
         sudo apt update -qq
         sudo apt install -y \
           libftdi1-2 \
-          libhidapi-libusb0 \
+          libhidapi-hidraw0 \
           udev
 
     - name: '📥 Download artifact: package'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee159cd..9540a9b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,11 @@ if(USE_PKGCONFIG)
 	find_package(PkgConfig REQUIRED)
 	pkg_check_modules(LIBFTDI REQUIRED libftdi1)
 	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)
 		pkg_check_modules(LIBUDEV libudev)
diff --git a/INSTALL.md b/INSTALL.md
index bd3fb00..8596914 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -24,7 +24,7 @@ sudo dnf install openFPGALoader
 This application uses **libftdi1**, so this library must be installed (and,
 depending of the distribution, headers too)
 ```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.