VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-26 01:39:05 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #328 from ra1nb0w/udev

Browse Source 
udev on Linux and libusb fix
This commit is contained in:
f4exb 2019-04-23 09:04:35 +02:00 committed by GitHub
commit af7e95e226
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -532,12 +532,16 @@ endif()
install(TARGETS sdrangelbench DESTINATION bin)
#install(TARGETS sdrbase DESTINATION lib)
#install files and directories
#install files and directories (linux specific)
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
install(DIRECTORY udev-rules DESTINATION share/sdrangel)
install(FILES udev-rules/install.sh DESTINATION share/sdrangel/udev-rules PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sdrbase.rcc DESTINATION bin)
install(FILES desktop/sdrangel.desktop DESTINATION share/applications)
install(FILES desktop/sdrangel_icon.png DESTINATION share/pixmaps)
endif()
# needed by REST API documentation
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sdrbase.rcc DESTINATION bin)
##############################################################################

1
fcdhid/CMakeLists.txt
View File

@ -17,6 +17,7 @@ include_directories(
.
${CMAKE_CURRENT_BINARY_DIR}
${LIBUSB_INCLUDE_DIR}
${ICONV_INCLUDE_DIR}
)
#add_definitions(-DQT_PLUGIN)

2
fcdhid/hid-libusb.c
View File

@ -46,7 +46,7 @@
#include <wchar.h>
/* GNU / LibUSB */
#include <libusb-1.0/libusb.h>
#include <libusb.h>
#include "iconv.h"
#include "../fcdhid/hidapi.h"