Skip to content

Commit a979413

Browse files
committed
CI: Install libhidapi-dev when building on Ubuntu.
CMake finds hidapi properly.
1 parent 7a9255b commit a979413

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

.github/workflows/cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
6464
- name: Install HIDAPI
6565
if: "matrix.os == 'ubuntu-latest'"
66-
run: sudo apt-get -y install libhidapi-hidraw0
66+
run: sudo apt-get -y install libhidapi-dev
6767
shell: bash
6868

6969
- name: Configure CMake

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
6767
- name: Install HIDAPI
6868
if: "matrix.os == 'ubuntu-latest'"
69-
run: sudo apt-get -y install libhidapi-hidraw0
69+
run: sudo apt-get -y install libhidapi-dev
7070
shell: bash
7171

7272
- name: Configure CMake

CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,10 @@ if(WIN32 OR APPLE OR EMSCRIPTEN)
4949
target_link_libraries(spnavdev PRIVATE hidapi::hidapi)
5050
target_include_directories(spnavdev PRIVATE ${CMAKE_BINARY_DIR}/extlib/hidapi/hidapi)
5151
else()
52-
find_package(HIDAPI)
53-
if(HIDAPI_FOUND)
52+
find_package(hidapi)
53+
if(hidapi_FOUND)
5454
set(HAVE_HIDAPI TRUE)
55-
target_link_libraries(spnavdev PRIVATE ${HIDAPI_LIBRARY})
56-
target_include_directories(spnavdev PRIVATE ${HIDAPI_INCLUDE_DIR})
55+
target_link_libraries(spnavdev PRIVATE hidapi::hidapi)
5756
endif()
5857
endif()
5958

0 commit comments

Comments
 (0)