diff options
Diffstat (limited to 'src/components/transport_manager')
5 files changed, 5 insertions, 8 deletions
diff --git a/src/components/transport_manager/CMakeLists.txt b/src/components/transport_manager/CMakeLists.txt index 8cd3fe617c..4fa224393d 100644 --- a/src/components/transport_manager/CMakeLists.txt +++ b/src/components/transport_manager/CMakeLists.txt @@ -40,7 +40,6 @@ include_directories ( ${COMPONENTS_DIR}/resumption/include ${POLICY_GLOBAL_INCLUDE_PATH}/ ${JSONCPP_INCLUDE_DIRECTORY} - ${LIBUSB_INCLUDE_DIRECTORY} ${LOG4CXX_INCLUDE_DIRECTORY} ) @@ -73,9 +72,7 @@ if(BUILD_USB_SUPPORT) ${COMPONENTS_DIR}/transport_manager/include/transport_manager/usb/qnx ${COMPONENTS_DIR}/transport_manager/src/usb/qnx ) - list(APPEND LIBRARIES - Libusb-1.0.16 - ) + elseif(CMAKE_SYSTEM_NAME STREQUAL "QNX") set(EXCLUDE_PATHS ${COMPONENTS_DIR}/transport_manager/include/transport_manager/usb/libusb diff --git a/src/components/transport_manager/include/transport_manager/usb/libusb/platform_usb_device.h b/src/components/transport_manager/include/transport_manager/usb/libusb/platform_usb_device.h index 1aa6881b38..baec1938b1 100644 --- a/src/components/transport_manager/include/transport_manager/usb/libusb/platform_usb_device.h +++ b/src/components/transport_manager/include/transport_manager/usb/libusb/platform_usb_device.h @@ -37,7 +37,7 @@ #define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_USB_LIBUSB_PLATFORM_USB_DEVICE_H_ #include <string> -#include <libusb/libusb.h> +#include <libusb-1.0/libusb.h> namespace transport_manager { diff --git a/src/components/transport_manager/include/transport_manager/usb/libusb/usb_handler.h b/src/components/transport_manager/include/transport_manager/usb/libusb/usb_handler.h index b2ebd3a977..bed631ea2e 100644 --- a/src/components/transport_manager/include/transport_manager/usb/libusb/usb_handler.h +++ b/src/components/transport_manager/include/transport_manager/usb/libusb/usb_handler.h @@ -36,7 +36,7 @@ #ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_USB_LIBUSB_USB_HANDLER_H_ #define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_USB_LIBUSB_USB_HANDLER_H_ -#include <libusb/libusb.h> +#include <libusb-1.0/libusb.h> #include "transport_manager/transport_adapter/transport_adapter.h" #include "transport_manager/usb/usb_control_transfer.h" diff --git a/src/components/transport_manager/src/usb/libusb/usb_connection.cc b/src/components/transport_manager/src/usb/libusb/usb_connection.cc index 3e59bdf40b..e9ab2bae8e 100644 --- a/src/components/transport_manager/src/usb/libusb/usb_connection.cc +++ b/src/components/transport_manager/src/usb/libusb/usb_connection.cc @@ -34,7 +34,7 @@ #include <unistd.h> #include <iomanip> -#include <libusb/libusb.h> +#include <libusb-1.0/libusb.h> #include <sstream> diff --git a/src/components/transport_manager/test/CMakeLists.txt b/src/components/transport_manager/test/CMakeLists.txt index 184d546f15..41aae296ac 100644 --- a/src/components/transport_manager/test/CMakeLists.txt +++ b/src/components/transport_manager/test/CMakeLists.txt @@ -59,7 +59,7 @@ set(LIBRARIES ) if (BUILD_USB_SUPPORT) - list(APPEND LIBRARIES Libusb-1.0.16) + list(APPEND LIBRARIES libusb-1.0.so) endif() if (BUILD_BT_SUPPORT) |