Skip to content

Commit e030825

Browse files
committed
cmake: Remove UsbDk build configs
1 parent 7d9ae17 commit e030825

File tree

2 files changed

+0
-26
lines changed

2 files changed

+0
-26
lines changed

CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ OPTION(ENABLE_OPENGL "Enable OpenGL support" ON)
3737
OPTION(ENABLE_VAAPI "Enable VA-API support" ON)
3838
OPTION(ENABLE_TEGRAJPEG "Enable Tegra HW JPEG support" ON)
3939
OPTION(ENABLE_PROFILING "Collect profiling stats (memory consuming)" OFF)
40-
IF(WIN32)
41-
OPTION(LIBUSB_USE_USBDK "Use Usbdk backend for libusb (or libusbK if OFF)" ON)
42-
ENDIF()
4340

4441
IF(ENABLE_PROFILING)
4542
SET(LIBFREENECT2_WITH_PROFILING 1)

cmake_modules/FindLibUSB.cmake

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -42,24 +42,6 @@ FIND_PATH(LibUSB_INCLUDE_DIRS
4242
)
4343

4444
SET(LIBUSB_NAME libusb)
45-
IF(WIN32)
46-
INCLUDE(CheckCSourceRuns)
47-
CHECK_C_SOURCE_RUNS("#include <windows.h>\nint main(){return !LoadLibraryA(\"libusbK\");}" LIBUSB_WITH_LIBUSBK)
48-
CHECK_C_SOURCE_RUNS("#include <windows.h>\nint main(){return !LoadLibraryA(\"UsbDkHelper\");}" LIBUSB_WITH_USBDK)
49-
50-
IF(LIBUSB_USE_USBDK)
51-
SET(LIBUSB_NAME libusb-usbdk)
52-
ENDIF()
53-
54-
IF(LIBUSB_NAME MATCHES ^libusb-usbdk$ AND NOT LIBUSB_WITH_USBDK)
55-
MESSAGE(WARNING "UsbDk device driver is not found. Fall back to libusbK.")
56-
SET(LIBUSB_NAME libusb)
57-
ENDIF()
58-
59-
IF(LIBUSB_NAME MATCHES ^libusb$ AND NOT LIBUSB_WITH_LIBUSBK)
60-
MESSAGE(FATAL_ERROR "No USB device driver is installed.")
61-
ENDIF()
62-
ENDIF()
6345

6446
FIND_LIBRARY(LibUSB_LIBRARIES
6547
NAMES ${LIBUSB_NAME}-1.0
@@ -91,11 +73,6 @@ FIND_FILE(LibUSB_DLL
9173
MS64
9274
MS64/dll
9375
)
94-
IF(LibUSB_DLL AND LIBUSB_USE_USBDK)
95-
FILE(COPY ${LibUSB_DLL} DESTINATION ${CMAKE_BINARY_DIR})
96-
SET(LibUSB_DLL ${CMAKE_BINARY_DIR}/libusb-1.0.dll)
97-
FILE(RENAME ${CMAKE_BINARY_DIR}/${LIBUSB_NAME}-1.0.dll ${LibUSB_DLL})
98-
ENDIF()
9976
ENDIF()
10077

10178
INCLUDE(FindPackageHandleStandardArgs)

0 commit comments

Comments
 (0)