Skip to content

Commit

Permalink
Fixed compilation error on windows
Browse files Browse the repository at this point in the history
Extraction of downloaded libusb archive failed due to wrong command 
option formatting since commit a8c1f41.
  • Loading branch information
Nightwalker-87 committed Apr 20, 2020
1 parent 629314c commit 7640daa
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions cmake/modules/Find_libusb.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ elseif (WIN32) # Windows

if (NOT LIBUSB_FOUND OR EXISTS "/etc/debian_version")
# Preparations for installing libusb library
find_package(_7zip REQUIRED)
find_package(7zip REQUIRED)

This comment has been minimized.

Copy link
@slyshykO

slyshykO Apr 20, 2020

Collaborator

CMake Error at cmake/modules/Find_libusb.cmake:76 (find_package):
By not providing "Find7zip.cmake" in CMAKE_MODULE_PATH this project has
asked CMake to find a package configuration file provided by "7zip", but
CMake did not find one.

This comment has been minimized.

Copy link
@Nightwalker-87

Nightwalker-87 Apr 20, 2020

Author Member

Correct, this is a accidental leftover from the search for the last reported bug.
As such things happen, if there is too much trouble around, we will have a separate testing branch soon.

This comment has been minimized.

Copy link
@Nightwalker-87

Nightwalker-87 Apr 20, 2020

Author Member

Fixed in commit a7568d3.

set(LIBUSB_WIN_VERSION 1.0.23) # set libusb version
set(LIBUSB_WIN_ARCHIVE libusb-${LIBUSB_WIN_VERSION}.7z)
set(LIBUSB_WIN_ARCHIVE_PATH ${CMAKE_BINARY_DIR}/${LIBUSB_WIN_ARCHIVE})
Expand All @@ -100,8 +100,8 @@ elseif (WIN32) # Windows
)
else ()
execute_process(
COMMAND ${ZIP_EXECUTABLE} x -y ${LIBUSB_WIN_ARCHIVE_PATH} -o ${LIBUSB_WIN_OUTPUT_FOLDER}
)
COMMAND ${ZIP_EXECUTABLE} x -y ${LIBUSB_WIN_ARCHIVE_PATH} -o${LIBUSB_WIN_OUTPUT_FOLDER}
) # <-- Note the absence of a space character following the -o option!
endif ()

# Find path to libusb library
Expand Down

0 comments on commit 7640daa

Please sign in to comment.