tza/openauto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libusb]

Browse Source 
Resolve compiler errors
This commit is contained in:
matt 2020-10-10 23:27:37 +01:00
parent fd5ce7ac07
commit c18f0edeb5
No known key found for this signature in database
GPG Key ID: 089C8B076569DD58
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -55,7 +55,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}
${Qt5Bluetooth_INCLUDE_DIRS} ${Qt5Bluetooth_INCLUDE_DIRS}
${Qt5Network_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${LIBUSB_1_INCLUDE_DIRS}
${PROTOBUF_INCLUDE_DIR} ${PROTOBUF_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR}
${RTAUDIO_INCLUDE_DIRS} ${RTAUDIO_INCLUDE_DIRS}
@ -77,13 +76,12 @@ file(GLOB_RECURSE autoapp_source_files ${autoapp_sources_directory}/*.ui ${autoa
add_executable(autoapp ${autoapp_source_files}) add_executable(autoapp ${autoapp_source_files})
target_link_libraries(autoapp target_link_libraries(autoapp libusb
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${Qt5Multimedia_LIBRARIES} ${Qt5Multimedia_LIBRARIES}
${Qt5MultimediaWidgets_LIBRARIES} ${Qt5MultimediaWidgets_LIBRARIES}
${Qt5Bluetooth_LIBRARIES} ${Qt5Bluetooth_LIBRARIES}
${Qt5Network_LIBRARIES} ${Qt5Network_LIBRARIES}
${LIBUSB_1_LIBRARIES}
${PROTOBUF_LIBRARIES} ${PROTOBUF_LIBRARIES}
${BCM_HOST_LIBRARIES} ${BCM_HOST_LIBRARIES}
${ILCLIENT_LIBRARIES} ${ILCLIENT_LIBRARIES}

15
cmake_modules/Findlibusb-1.0.cmake
View File

@ -49,14 +49,14 @@ if (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)
else (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS) else (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)
find_path(LIBUSB_1_INCLUDE_DIR find_path(LIBUSB_1_INCLUDE_DIR
NAMES NAMES
libusb.h libusb.h
PATHS PATHS
/usr/include /usr/include
/usr/local/include /usr/local/include
/opt/local/include /opt/local/include
/sw/include /sw/include
PATH_SUFFIXES PATH_SUFFIXES
libusb-1.0 libusb-1.0
) )
find_library(LIBUSB_1_LIBRARY find_library(LIBUSB_1_LIBRARY
@ -83,8 +83,11 @@ else (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)
if (LIBUSB_1_FOUND) if (LIBUSB_1_FOUND)
if (NOT libusb_1_FIND_QUIETLY) if (NOT libusb_1_FIND_QUIETLY)
message(STATUS "Found libusb-1.0:") message(STATUS "Found libusb-1.0:")
message(STATUS " - Includes: ${LIBUSB_1_INCLUDE_DIRS}") message(STATUS " - Includes: ${LIBUSB_1_INCLUDE_DIRS}")
message(STATUS " - Libraries: ${LIBUSB_1_LIBRARIES}") message(STATUS " - Libraries: ${LIBUSB_1_LIBRARIES}")
add_library(libusb INTERFACE)
target_include_directories(libusb SYSTEM INTERFACE ${LIBUSB_1_INCLUDE_DIR})
target_link_libraries(libusb INTERFACE ${LIBUSB_1_LIBRARY})
endif (NOT libusb_1_FIND_QUIETLY) endif (NOT libusb_1_FIND_QUIETLY)
else (LIBUSB_1_FOUND) else (LIBUSB_1_FOUND)
if (libusb_1_FIND_REQUIRED) if (libusb_1_FIND_REQUIRED)
@ -95,4 +98,4 @@ else (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)
# show the LIBUSB_1_INCLUDE_DIRS and LIBUSB_1_LIBRARIES variables only in the advanced view # show the LIBUSB_1_INCLUDE_DIRS and LIBUSB_1_LIBRARIES variables only in the advanced view
mark_as_advanced(LIBUSB_1_INCLUDE_DIRS LIBUSB_1_LIBRARIES) mark_as_advanced(LIBUSB_1_INCLUDE_DIRS LIBUSB_1_LIBRARIES)
endif (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS) endif (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)