diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2023-09-25 13:35:18 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2023-10-30 13:10:34 +0300 |
| commit | 0726bf183dc94a8c7503d8dff5b9ed4b9f9cb683 (patch) | |
| tree | ae8b428e60c12de1a71fadcd8e64eecb89f22a2e | |
| parent | 8e569347c2a8a9221aa13d239db170569285cf07 (diff) | |
CMake: Find arm64 libusb
Use updated libusb package which has arm64 support.
Task-number: QTBUG-117088
Change-Id: Iad2acefd3f860f8f46a8b6cb2df8efd216907e43
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
| -rw-r--r-- | cmake/FindlibUsb.cmake | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/cmake/FindlibUsb.cmake b/cmake/FindlibUsb.cmake index 9b90791..7c07aa5 100644 --- a/cmake/FindlibUsb.cmake +++ b/cmake/FindlibUsb.cmake @@ -1,17 +1,7 @@ if (MSVC) - set(WINDOWS_LIBUSB_PATH "$ENV{LIBUSB_PATH}/VS2019/MS64/static") - - # check if we're using something else than 64bit.. - if (NOT "${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") - set(WINDOWS_LIBUSB_PATH "$ENV{LIBUSB_PATH}/VS2019/MS32/static") - endif() -endif() - -if (MINGW) - set(WINDOWS_LIBUSB_PATH "$ENV{LIBUSB_PATH}/MinGW64/static") - # check if we're using something else than 64bit.. - if (NOT "${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") - set(WINDOWS_LIBUSB_PATH "$ENV{LIBUSB_PATH}/MinGW32/static") + set(WINDOWS_LIBUSB_PATH "$ENV{LIBUSB_PATH}/x64-windows-static") + if (TEST_architecture_arch STREQUAL arm64) + set(WINDOWS_LIBUSB_PATH "$ENV{LIBUSB_PATH}/arm64-windows-static") endif() endif() @@ -21,11 +11,11 @@ endif() find_library (LIBUSB_LIBRARY NAMES libusb libusb-1.0 usb-1.0 - PATHS "/usr/lib" "/usr/local/lib/" "${WINDOWS_LIBUSB_PATH}") + PATHS "/usr/lib" "/usr/local/lib" "${WINDOWS_LIBUSB_PATH}/lib") find_path (LIBUSB_INCLUDEDIR NAMES libusb.h libusb-1.0.h - PATHS "/usr/local/include/" "$ENV{LIBUSB_PATH}/include/libusb-1.0" + PATHS "/usr/local/include" "${WINDOWS_LIBUSB_PATH}/include" PATH_SUFFIXES "include" "libusb" "libusb-1.0") include(FindPackageHandleStandardArgs) |