fix for cmake version 2.8

CMakeLists.txt

@@ -1,12 +1,6 @@
-cmake_minimum_required(VERSION 2.8)
-cmake_policy(SET CMP0048 OLD)
-project(hidapi)
-
-set(VERSION_MAJOR "0")
-set(VERSION_MINOR "7")
-set(VERSION_PATCH "1")
-set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+cmake_minimum_required(VERSION 3.0)
 
+project(hidapi VERSION 0.7.1)
 
 option(HID_DEBUG_PARSER "verbose parser debugging output" OFF)
 
@@ -16,7 +10,7 @@ option(HID_DEBUG_PARSER "verbose parser debugging output" OFF)
 option(HID_EXAMPLE_TEST "build test example" OFF)
 option(HID_EXAMPLE_OSC "build osc example" OFF)
 
-option(HID_INSTALL_HUT "install hid usage tables" OFF)
+option(HID_INSTALL_HUT "install hid usage tables" ON)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set(HIDAPI "default" CACHE STRING "HID API to use (one of {default,hidraw,libusb})")
@@ -96,17 +90,38 @@ if( HID_EXAMPLE_TEST )
   if(APPLE)
     add_subdirectory(hidtestosx)
   endif()
+  if(WIN32)
+    add_subdirectory(hidtestwindows)
+  endif()
 endif()
 
 if( HID_EXAMPLE_OSC )
   add_subdirectory(hidapi2osc)
 endif()
 
-if( HID_DEBUG_PARSER )
-  set(HID_HUT_PATH ${CMAKE_INSTALL_PREFIX}/share/hidapi CACHE STRING "Installation path for the HID usage tables")
-
+if( HID_DEBUG_PARSER OR HID_INSTALL_HUT )
+  # provisional to avoid having to commit to sc master while the HID submodule
+  # is not final/added to master
+  # the sc-settings for cmake_install_prefix and scappauxresourcesdir are not
+  # visible in this scope
+  if(APPLE)
+    if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+        SET(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/Install")
+    endif()
+    # this will break if scappbundlename is reassigned in SC
+    # similar problem in editors/sc-ide/CMakeLists.txt 284
+    set(scappbundlename "SuperCollider")
+    set(scappauxresourcesdir "${scappbundlename}/${scappbundlename}.app/Contents/Resources")
+    set(HID_HUT_PATH "${CMAKE_INSTALL_PREFIX}/${scappauxresourcesdir}/HID_Support")
+  elseif(WIN32)
+    set(auxresourcesdir "SuperCollider" CACHE STRING "Resources directory")
+    set(HID_HUT_PATH "${CMAKE_INSTALL_PREFIX}/${auxresourcesdir}/HID_Support")
+  else()
+    set(auxresourcesdir "share/SuperCollider" CACHE STRING "Resources directory")
+    set(HID_HUT_PATH "${CMAKE_INSTALL_PREFIX}/${auxresourcesdir}/HID_Support")
+  endif(APPLE)
   install(DIRECTORY hut
-	DESTINATION ${HID_HUT_PATH}
-	FILES_MATCHING PATTERN "*.yaml"
+  DESTINATION ${HID_HUT_PATH}
+  FILES_MATCHING PATTERN "*.yaml"
   )
 endif()

cmake_modules/Findlibusb-1.0.cmake

@@ -43,13 +43,25 @@
 #
 
 
+if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+  # Remove prefix "1" as FreeBSD has its own implementation
+  # of libusb compatible with libusb1.
+  set(LIBUSB_1_HEADER_NAME "libusb.h")
+  set(LIBUSB_1_LIBRARY_NAME "usb")
+else(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+  # Just preserve values before my intrusion. 10.04.2017 Vasily
+  # Can it be just "libusb.h" for Linux also?
+  set(LIBUSB_1_HEADER_NAME "libusb-1.0/libusb.h")
+  set(LIBUSB_1_LIBRARY_NAME "usb-1.0")
+endif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+
 if (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)
   # in cache already
   set(LIBUSB_FOUND TRUE)
 else (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)
   find_path(LIBUSB_1_INCLUDE_DIR
     NAMES
-	libusb-1.0/libusb.h
+	${LIBUSB_1_HEADER_NAME}
     PATHS
       /usr/include
       /usr/local/include
@@ -61,7 +73,7 @@ else (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)
 
   find_library(LIBUSB_1_LIBRARY
     NAMES
-      usb-1.0
+      ${LIBUSB_1_LIBRARY_NAME}
     PATHS
       /usr/lib
       /usr/local/lib

hidapi/hidapi.h

@@ -429,6 +429,10 @@ extern "C" {
 		int HID_API_EXPORT HID_API_CALL hid_dump_element_info(hid_device *dev);
 		IOHIDDeviceRef HID_API_EXPORT HID_API_CALL get_device_handle( hid_device *dev );
 #endif
+#ifdef WIN32
+    #include <windows.h>
+        HANDLE HID_API_EXPORT HID_API_CALL get_device_handle(hid_device *dev);
+#endif
 
 #ifdef __cplusplus
 }