diff options
| author | Artem Nosach <ANosach@luxoft.com> | 2016-06-06 13:49:26 +0300 |
|---|---|---|
| committer | Artem Nosach <ANosach@luxoft.com> | 2016-06-06 14:26:35 +0300 |
| commit | 2db0896f804c233466b11092b18abccb4d898911 (patch) | |
| tree | 2436e2884986e5498a8c3ef28daacecf0ef4e173 | |
| parent | 7db5a33ffd2fa6d6b439cfee6c16dd1d0512faad (diff) | |
| download | sdl_core-2db0896f804c233466b11092b18abccb4d898911.tar.gz | |
Fix POSIX libusb dependencies
Related-issues: APPLINK-22713, APPLINK-22716
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | cmake/Modules/FindLibUSBx.cmake | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 99dcc0e149..7796023c26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ addons: - libbluetooth3 - libbluetooth-dev - libudev-dev + - libusb-1.0 - cmake - html2text - clang-format-3.6 diff --git a/cmake/Modules/FindLibUSBx.cmake b/cmake/Modules/FindLibUSBx.cmake index 2e84a9006d..9af22cd0f2 100644 --- a/cmake/Modules/FindLibUSBx.cmake +++ b/cmake/Modules/FindLibUSBx.cmake @@ -15,7 +15,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") set(LIBUSBX_LIBS_DIRECTORY ${LIBUSBX_DIR}/bin) set(LIBUSBX_LIBRARIES ${LIBUSBX_LIBS_DIRECTORY}/libusb-1.0.lib) else() - set(LIBUSBX_INCLUDE_DIRECTORY /usr/local/include/libusb-1.0) - set(LIBUSBX_LIBS_DIRECTORY /usr/local/lib) - set(LIBUSBX_LIBRARIES ${LIBUSBX_LIBS_DIRECTORY}/libusb-1.0.a udev) + set(LIBUSBX_INCLUDE_DIRECTORY /usr/include/libusb-1.0) + set(LIBUSBX_LIBS_DIRECTORY /usr/lib) + set(LIBUSBX_LIBRARIES usb-1.0 udev) endif() |