Update CMake modules.
Merge commit 'dd2c7e902aa095fd7844329e38bca7cd7c51e6d9' into osx-refactor_sync-mplus Conflicts: cmake/FindWinHID.cmake
This commit is contained in:
@@ -29,7 +29,7 @@ set(LIBUSB1_ROOT_DIR
|
||||
CACHE
|
||||
PATH
|
||||
"Root directory to search for libusb-1")
|
||||
|
||||
|
||||
if(WIN32)
|
||||
include(ProgramFilesGlob)
|
||||
program_files_fallback_glob(_dirs "LibUSB-Win32")
|
||||
@@ -42,7 +42,7 @@ if(WIN32)
|
||||
set(_lib_suffixes lib/msvc)
|
||||
elseif(COMPILER_IS_GNUCXX)
|
||||
set(_lib_suffixes lib/gcc)
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
else()
|
||||
set(_lib_suffixes)
|
||||
@@ -81,11 +81,9 @@ find_package_handle_standard_args(Libusb1
|
||||
LIBUSB1_INCLUDE_DIR)
|
||||
|
||||
if(LIBUSB1_FOUND)
|
||||
set(LIBUSB1_LIBRARIES
|
||||
"${LIBUSB1_LIBRARY}")
|
||||
set(LIBUSB1_LIBRARIES "${LIBUSB1_LIBRARY}")
|
||||
|
||||
set(LIBUSB1_INCLUDE_DIRS
|
||||
"${LIBUSB1_INCLUDE_DIR}")
|
||||
set(LIBUSB1_INCLUDE_DIRS "${LIBUSB1_INCLUDE_DIR}")
|
||||
|
||||
mark_as_advanced(LIBUSB1_ROOT_DIR)
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user