build: Use usbdk for libusb on Windows

Author: xlz

CMakeLists.txt

@@ -37,6 +37,9 @@ OPTION(ENABLE_OPENGL "Enable OpenGL support" ON)
 OPTION(ENABLE_VAAPI "Enable VA-API support" ON)
 OPTION(ENABLE_TEGRAJPEG "Enable Tegra HW JPEG support" ON)
 OPTION(ENABLE_PROFILING "Collect profiling stats (memory consuming)" OFF)
+IF(WIN32)
+  OPTION(LIBUSB_USE_USBDK "Use Usbdk backend for libusb (or libusbK if OFF)" ON)
+ENDIF()
 
 IF(ENABLE_PROFILING)
   SET(LIBFREENECT2_WITH_PROFILING 1)
@@ -257,7 +260,7 @@ IF(TurboJPEG_FOUND)
   )
 ENDIF()
 
-SET(HAVE_OpenGL disablsed)
+SET(HAVE_OpenGL disabled)
 IF(ENABLE_OPENGL)
   FIND_PACKAGE(GLFW3)
   FIND_PACKAGE(OpenGL)
@@ -289,7 +292,7 @@ IF(ENABLE_OPENGL)
   ENDIF()
 ENDIF(ENABLE_OPENGL)
 
-SET(HAVE_OpenCL disablsed)
+SET(HAVE_OpenCL disabled)
 IF(ENABLE_OPENCL)
   FIND_PACKAGE(OpenCL)
 
@@ -329,11 +332,13 @@ IF(ENABLE_OPENCL)
   ENDIF(OpenCL_FOUND)
 ENDIF(ENABLE_OPENCL)
 
-SET(HAVE_CUDA disablsed)
+SET(HAVE_CUDA disabled)
 IF(ENABLE_CUDA)
   FIND_PACKAGE(CUDA)
   SET(HAVE_CUDA no)
-  IF(CUDA_FOUND)
+  IF(CUDA_FOUND AND MSVC14 AND CUDA_VERSION VERSION_LESS 8.0)
+    SET(HAVE_CUDA "no (VS2015 not supported)")
+  ELSEIF(CUDA_FOUND)
     SET(LIBFREENECT2_WITH_CUDA_SUPPORT 1)
     SET(HAVE_CUDA yes)
 
@@ -367,7 +372,7 @@ IF(ENABLE_CUDA)
     LIST(APPEND LIBRARIES
       ${CUDA_LIBRARIES}
     )
-  ENDIF(CUDA_FOUND)
+  ENDIF()
 ENDIF(ENABLE_CUDA)
 
 # RPATH handling for private libusb copies
@@ -424,14 +429,14 @@ INSTALL(FILES "${PROJECT_BINARY_DIR}/freenect2.pc" DESTINATION lib/pkgconfig/)
 
 ADD_SUBDIRECTORY(${MY_DIR}/doc)
 
-SET(HAVE_Examples disablsed)
+SET(HAVE_Examples disabled)
 IF(BUILD_EXAMPLES)
   SET(HAVE_Examples yes)
   MESSAGE(STATUS "Configurating examples")
   ADD_SUBDIRECTORY(${MY_DIR}/examples)
 ENDIF()
 
-SET(HAVE_OpenNI2 disablsed)
+SET(HAVE_OpenNI2 disabled)
 IF(BUILD_OPENNI2_DRIVER)
   FIND_PACKAGE(OpenNI2)
   SET(HAVE_OpenNI2 no)

cmake_modules/FindLibUSB.cmake

@@ -41,8 +41,13 @@ FIND_PATH(LibUSB_INCLUDE_DIRS
     include/libusb-1.0
 )
 
+SET(LIBUSB_NAME libusb)
+IF(LIBUSB_USE_USBDK)
+  SET(LIBUSB_NAME libusb-usbdk)
+ENDIF()
+
 FIND_LIBRARY(LibUSB_LIBRARIES
-  NAMES libusb-1.0
+  NAMES ${LIBUSB_NAME}-1.0
   PATHS
     "${DEPENDS_DIR}/libusb"
     "${DEPENDS_DIR}/libusbx"
@@ -58,7 +63,7 @@ FIND_LIBRARY(LibUSB_LIBRARIES
 
 IF(WIN32)
 FIND_FILE(LibUSB_DLL
-  libusb-1.0.dll
+  ${LIBUSB_NAME}-1.0.dll
   PATHS
     "${DEPENDS_DIR}/libusb"
     "${DEPENDS_DIR}/libusbx"
@@ -71,6 +76,11 @@ FIND_FILE(LibUSB_DLL
     MS64
     MS64/dll
 )
+IF(LibUSB_DLL AND LIBUSB_USE_USBDK)
+  FILE(COPY ${LibUSB_DLL} DESTINATION ${CMAKE_BINARY_DIR})
+  SET(LibUSB_DLL ${CMAKE_BINARY_DIR}/libusb-1.0.dll)
+  FILE(RENAME ${CMAKE_BINARY_DIR}/${LIBUSB_NAME}-1.0.dll ${LibUSB_DLL})
+ENDIF()
 ENDIF()
 
 INCLUDE(FindPackageHandleStandardArgs)

depends/install_libusb_vs2013.cmd

@@ -11,11 +11,15 @@ git fetch xlz || exit /b
 git merge xlz/winiso
 
 set CONFIG=Release
-msbuild msvc\libusb_dll_2013.vcxproj /p:Platform=x64 /p:Configuration=%CONFIG% /target:Rebuild
+set YEAR=2013
+set MSBUILD="C:\Program Files (x86)\MSBuild\12.0\Bin\MSBuild.exe"
+
+%MSBUILD% msvc\libusb_dll_%YEAR%.vcxproj /p:Platform=x64 /p:Configuration=%CONFIG% /target:Rebuild || exit /b
+%MSBUILD% msvc\libusb_usbdk_dll_%YEAR%.vcxproj /p:Platform=x64 /p:Configuration=%CONFIG% /target:Rebuild || exit /b
 
 mkdir ..\libusb\include\libusb-1.0
 copy libusb\libusb.h ..\libusb\include\libusb-1.0
 mkdir ..\libusb\MS64\dll
-copy x64\%CONFIG%\dll\libusb-1.0.lib ..\libusb\MS64\dll
-copy x64\%CONFIG%\dll\libusb-1.0.dll ..\libusb\MS64\dll
-copy x64\%CONFIG%\dll\libusb-1.0.pdb ..\libusb\MS64\dll
+copy x64\%CONFIG%\dll\*.lib ..\libusb\MS64\dll
+copy x64\%CONFIG%\dll\*.dll ..\libusb\MS64\dll
+copy x64\%CONFIG%\dll\*.pdb ..\libusb\MS64\dll

depends/install_libusb_vs2015.cmd

@@ -11,11 +11,15 @@ git fetch xlz || exit /b
 git merge xlz/winiso
 
 set CONFIG=Release
-msbuild msvc\libusb_dll_2015.vcxproj /p:Platform=x64 /p:Configuration=%CONFIG% /target:Rebuild
+set YEAR=2015
+set MSBUILD="C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe"
+
+%MSBUILD% msvc\libusb_dll_%YEAR%.vcxproj /p:Platform=x64 /p:Configuration=%CONFIG% /target:Rebuild || exit /b
+%MSBUILD% msvc\libusb_usbdk_dll_%YEAR%.vcxproj /p:Platform=x64 /p:Configuration=%CONFIG% /target:Rebuild || exit /b
 
 mkdir ..\libusb\include\libusb-1.0
 copy libusb\libusb.h ..\libusb\include\libusb-1.0
 mkdir ..\libusb\MS64\dll
-copy x64\%CONFIG%\dll\libusb-1.0.lib ..\libusb\MS64\dll
-copy x64\%CONFIG%\dll\libusb-1.0.dll ..\libusb\MS64\dll
-copy x64\%CONFIG%\dll\libusb-1.0.pdb ..\libusb\MS64\dll
+copy x64\%CONFIG%\dll\*.lib ..\libusb\MS64\dll
+copy x64\%CONFIG%\dll\*.dll ..\libusb\MS64\dll
+copy x64\%CONFIG%\dll\*.pdb ..\libusb\MS64\dll