diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-04-08 23:59:42 +0200 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-04-08 23:59:42 +0200 |
| commit | 9dc6ff7aad276c601c53105b1ce8c6dd70fc5fd7 (patch) | |
| tree | 13528f42a90dc82bf2d336388ea8ca419dacfeda /CMakeLists.txt | |
| parent | 54c38e11279810b74c27cdce76a016d0c4ca10ff (diff) | |
| parent | 34bd086efa27a9de2fc720bcddf56e81e1644d44 (diff) | |
Merge branch 'master' of github.com:mixxxdj/mixxx into controller-fixes-part2
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 66c2b5aecf..0ecc247eb3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1987,16 +1987,16 @@ if(HID) if(HIDAPI_STATIC) message(STATUS "Linking internal libhidapi statically") add_library(mixxx-hidapi STATIC EXCLUDE_FROM_ALL) - target_include_directories(mixxx-hidapi SYSTEM PUBLIC lib/hidapi-0.8.0-rc1/hidapi) + target_include_directories(mixxx-hidapi SYSTEM PUBLIC lib/hidapi/hidapi) if(WIN32) - target_sources(mixxx-hidapi PRIVATE lib/hidapi-0.8.0-rc1/windows/hid.c) + target_sources(mixxx-hidapi PRIVATE lib/hidapi/windows/hid.c) elseif(APPLE) - target_sources(mixxx-hidapi PRIVATE lib/hidapi-0.8.0-rc1/mac/hid.c) + target_sources(mixxx-hidapi PRIVATE lib/hidapi/mac/hid.c) elseif(UNIX) if(NOT LibUSB_FOUND) message(FATAL_ERROR "USB HID controller support on Unix with statically linked libhidapi-libusb requires libusb 1.0 and its development headers.") endif() - target_sources(mixxx-hidapi PRIVATE lib/hidapi-0.8.0-rc1/libusb/hid.c) + target_sources(mixxx-hidapi PRIVATE lib/hidapi/libusb/hid.c) target_link_libraries(mixxx-hidapi PRIVATE LibUSB::LibUSB) else() message(FATAL_ERROR "USB HID controller support only possible on Windows/Mac OS/Linux/BSD.") |