VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-05-18 07:12:17 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'acars' of https://github.com/srcejon/sdrangel into acars

Browse Source
This commit is contained in:
Jon Beniston 2026-03-25 16:30:54 +00:00
commit a85903a12f
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -666,6 +666,10 @@ elseif(ANDROID)
)
endif()
add_compile_definitions(ANDROID)
elseif(UNIX)
set(CMAKE_FIND_ROOT_PATH "/usr/local")
include_directories("/usr/local/include")
link_directories("/usr/local/lib")
endif()
# When building a bundle on MacOS, we want to keep build paths in the library

2
cmake/Modules/FindLibUSB.cmake
View File

@ -8,7 +8,7 @@ if(NOT LIBUSB_FOUND)
/usr/local/include
)
find_library(LIBUSB_LIBRARIES NAMES usb-1.0
find_library(LIBUSB_LIBRARIES NAMES usb-1.0 usb
PATHS
${LIBUSB_PKG_LIBRARY_DIRS}
/usr/lib