Skip to content

Commit 0ec60c0

Browse files
committed
Add <root>/libusb to includes for in-tree build
Otherwise it is impossible to `#include <hidapi_libusb.h>`, when HIDAPI is added directly as a subdirectory of a CMake project.
1 parent b923aed commit 0ec60c0

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

libusb/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
cmake_minimum_required(VERSION 3.6.3 FATAL_ERROR)
22

3+
list(APPEND HIDAPI_PUBLIC_HEADERS "hidapi_libusb.h")
4+
35
add_library(hidapi_libusb
46
${HIDAPI_PUBLIC_HEADERS}
57
hid.c
6-
hidapi_libusb.h
78
)
89
target_link_libraries(hidapi_libusb PUBLIC hidapi_include)
910

@@ -24,7 +25,7 @@ set_target_properties(hidapi_libusb
2425
OUTPUT_NAME "hidapi-libusb"
2526
VERSION ${PROJECT_VERSION}
2627
SOVERSION ${PROJECT_VERSION_MAJOR}
27-
PUBLIC_HEADER "${HIDAPI_PUBLIC_HEADERS};hidapi_libusb.h"
28+
PUBLIC_HEADER "${HIDAPI_PUBLIC_HEADERS}"
2829
)
2930

3031
# compatibility with find_package()

src/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,9 @@ else()
125125
set(HIDAPI_WITH_LIBUSB ON)
126126
endif()
127127
if(HIDAPI_WITH_LIBUSB)
128+
target_include_directories(hidapi_include INTERFACE
129+
"$<BUILD_INTERFACE:${PROJECT_ROOT}/libusb>"
130+
)
128131
add_subdirectory("${PROJECT_ROOT}/libusb" libusb)
129132
list(APPEND EXPORT_COMPONENTS libusb)
130133
if(NOT EXPORT_ALIAS)

0 commit comments

Comments
 (0)