diff --git a/CMake/external_libusb.cmake b/CMake/external_libusb.cmake index 7d329819325..5ec1bb8b122 100644 --- a/CMake/external_libusb.cmake +++ b/CMake/external_libusb.cmake @@ -2,15 +2,11 @@ include(ExternalProject) ExternalProject_Add( libusb + PREFIX libusb + GIT_REPOSITORY "https://github.com/libusb/libusb-cmake.git" + GIT_TAG "v1.0.27-1" # "v1.0.27-1" - # Work-around for libusb master broken on Nov 26' 2020 with introduction of v1.0.24 - # the issue has been reported in https://github.com/libusb/libusb/issues/812 - GIT_REPOSITORY "https://github.com/ev-mp/libusb.git" - GIT_TAG "2a7372db54094a406a755f0b8548b614ba8c78ec" # "v1.0.22" + Mac get_device_list hang fix - - UPDATE_COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${CMAKE_CURRENT_SOURCE_DIR}/third-party/libusb/CMakeLists.txt - ${CMAKE_CURRENT_BINARY_DIR}/third-party/libusb/CMakeLists.txt + UPDATE_COMMAND "" PATCH_COMMAND "" SOURCE_DIR "third-party/libusb/" @@ -19,15 +15,17 @@ ExternalProject_Add( -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DANDROID_ABI=${ANDROID_ABI} -DANDROID_STL=${ANDROID_STL} + -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/libusb_install + -DLIBUSB_INSTALL_TARGETS=ON --no-warn-unused-cli TEST_COMMAND "" - BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/libusb_install/lib/${CMAKE_STATIC_LIBRARY_PREFIX}usb${CMAKE_STATIC_LIBRARY_SUFFIX} + #BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/libusb_install/lib/${CMAKE_STATIC_LIBRARY_PREFIX}usb${CMAKE_STATIC_LIBRARY_SUFFIX} ) add_library(usb INTERFACE) target_include_directories(usb INTERFACE $) -target_link_libraries(usb INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/libusb_install/lib/${CMAKE_STATIC_LIBRARY_PREFIX}usb${CMAKE_STATIC_LIBRARY_SUFFIX}) +target_link_libraries(usb INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/libusb_install/lib/${CMAKE_STATIC_LIBRARY_PREFIX}libusb-1.0${CMAKE_STATIC_LIBRARY_SUFFIX}) set(USE_EXTERNAL_USB ON) # INTERFACE libraries can't have real deps, so targets that link with usb need to also depend on libusb set_target_properties( libusb PROPERTIES FOLDER "3rd Party") diff --git a/third-party/libusb/CMakeLists.txt b/third-party/libusb/CMakeLists-remove.txt similarity index 100% rename from third-party/libusb/CMakeLists.txt rename to third-party/libusb/CMakeLists-remove.txt