build: clean up hidapi settings

Author: dyfer

CMakeLists.txt

@@ -153,11 +153,7 @@ endif()
 
 option(FORTIFY "Define -D_FORTIFY_SOURCE=2 to check for programming errors" OFF)
 
-if(MINGW AND (${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 5.3.0))
-    option(SC_HIDAPI "Build with HID support" OFF)
-else()
-    option(SC_HIDAPI "Build with HID support" ON)
-endif()
+option(SC_HIDAPI "Build with HID support" ON)
 
 option(SC_ABLETON_LINK "Build with Ableton Link support" ON)
 

external_libraries/CMakeLists.txt

@@ -155,8 +155,6 @@ set( EXAMPLE_OSC OFF )
 if(SC_HIDAPI)
     add_subdirectory(hidapi)
     message(STATUS "Building with HID support")
-elseif(MINGW AND (${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 5.3.0))
-    message(WARNING "SC is by default built without HID-support if a MinGW/gcc-version below 5.3 is used. Please consult the Readme on how to enable it (easy).")
 else()
     message(STATUS "HID support disabled")
 endif()

lang/CMakeLists.txt

@@ -167,7 +167,7 @@ if(SC_HIDAPI)
         ${CMAKE_SOURCE_DIR}/external_libraries/hidapi/hidapi
         ${CMAKE_SOURCE_DIR}/external_libraries/hidapi/hidapi_parser
     )
-    add_definitions(-DSC_HIDAPI)
+    add_compile_definitions(SC_HIDAPI)
 endif(SC_HIDAPI)
 
 if(SC_QT OR SC_IDE)
@@ -223,6 +223,9 @@ endif()
 if(SC_HIDAPI)
   target_compile_definitions(libsclang PRIVATE HAVE_HIDAPI)
   target_link_libraries( libsclang hidapi hidapi_parser )
+  if(WIN32)
+    target_link_libraries(libsclang hid)
+  endif()
 
   if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND HID_HIDRAW)
     target_link_libraries( libsclang ${UDEV_LIBRARIES})
@@ -321,9 +324,7 @@ if (FFTW3F_FOUND)
 	target_link_libraries(libsclang ${FFTW3F_LIBRARY})
 endif()
 
-if (WIN32 AND SC_HIDAPI)
-	target_link_libraries(libsclang wsock32 ws2_32 portmidi iphlpapi hid)
-elseif(WIN32)
+if (WIN32)
 	target_link_libraries(libsclang wsock32 ws2_32 portmidi iphlpapi)
 endif()