From f7a7e898135897984b8a5b8c1638987ce06ddd29 Mon Sep 17 00:00:00 2001 From: Slyshyk Oleksiy Date: Mon, 7 Nov 2016 11:43:49 +0200 Subject: [PATCH 1/2] fix wrong libusb extract command --- cmake/modules/FindLibUSB.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/FindLibUSB.cmake b/cmake/modules/FindLibUSB.cmake index 45472b96e..84020b98b 100644 --- a/cmake/modules/FindLibUSB.cmake +++ b/cmake/modules/FindLibUSB.cmake @@ -24,7 +24,7 @@ if(WIN32 OR CMAKE_VS_PLATFORM_NAME OR MINGW OR MSYS) ) endif() file(MAKE_DIRECTORY ${LIBUSB_WIN_OUTPUT_FOLDER}) - execute_process(COMMAND ${ZIP_LOCATION} x -y ${LIBUSB_WIN_ARCHIVE_PATH} -o${LIBUSB_WIN_OUTPUT_FOLDER}) + execute_process(COMMAND ${ZIP_EXECUTABLE} x -y ${LIBUSB_WIN_ARCHIVE_PATH} -o${LIBUSB_WIN_OUTPUT_FOLDER}) endif() # FreeBSD From b6013eb0ab8f765590354b291389bf88687b4d54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=BB=D1=8B=D1=88=D0=B8=D0=BA=20=D0=90=D0=BB=D0=B5?= =?UTF-8?q?=D0=BA=D1=81=D0=B5=D0=B9?= <Слышик Алексей> Date: Wed, 1 Mar 2017 10:45:47 +0200 Subject: [PATCH 2/2] update libusb to 1.0.21 under windows --- cmake/modules/FindLibUSB.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/FindLibUSB.cmake b/cmake/modules/FindLibUSB.cmake index 84020b98b..b106018d2 100644 --- a/cmake/modules/FindLibUSB.cmake +++ b/cmake/modules/FindLibUSB.cmake @@ -9,7 +9,7 @@ if(WIN32 OR CMAKE_VS_PLATFORM_NAME OR MINGW OR MSYS) find_package(7Zip REQUIRED) - set(LIBUSB_WIN_VERSION 1.0.20) + set(LIBUSB_WIN_VERSION 1.0.21) set(LIBUSB_WIN_ARCHIVE libusb-${LIBUSB_WIN_VERSION}.7z) set(LIBUSB_WIN_ARCHIVE_PATH ${CMAKE_BINARY_DIR}/${LIBUSB_WIN_ARCHIVE}) set(LIBUSB_WIN_OUTPUT_FOLDER ${CMAKE_BINARY_DIR}/3thparty/libusb-${LIBUSB_WIN_VERSION})