mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-12-23 01:55:48 -05:00
Merge branch 'master' into dev
This commit is contained in:
commit
1f8f8e4286
@ -1,5 +1,4 @@
|
||||
cmake_minimum_required(VERSION 3.1.0)
|
||||
cmake_policy(SET CMP0043 OLD)
|
||||
|
||||
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9")
|
||||
message(FATAL_ERROR "SDRangel requires GCC version 4.9 or higher!")
|
||||
@ -425,9 +424,7 @@ target_link_libraries(sdrangel
|
||||
|
||||
if(WIN32)
|
||||
set_target_properties(sdrangel PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
|
||||
set_target_properties(sdrangel PROPERTIES COMPILE_DEFINITIONS_DEBUG "_CONSOLE")
|
||||
set_target_properties(sdrangel PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:CONSOLE")
|
||||
set_target_properties(sdrangel PROPERTIES COMPILE_DEFINITIONS_RELWITHDEBINFO "_CONSOLE")
|
||||
set_target_properties(sdrangel PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:windows /ENTRY:mainCRTStartup")
|
||||
set_target_properties(sdrangel PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:windows /ENTRY:mainCRTStartup")
|
||||
endif(WIN32)
|
||||
|
@ -42,20 +42,11 @@ bool DevicePerseusScan::scan(int nbDevices)
|
||||
continue;
|
||||
}
|
||||
|
||||
if (descr->firmware_downloaded)
|
||||
{
|
||||
qDebug("DevicePerseusScan::scan: device #%d firmware is already downloaded", deviceIndex);
|
||||
}
|
||||
else
|
||||
{
|
||||
qDebug("DevicePerseusScan::scan: device #%d firmware is not yet downloaded", deviceIndex);
|
||||
done = false;
|
||||
}
|
||||
|
||||
if (perseus_firmware_download(descr, 0) < 0)
|
||||
{
|
||||
qCritical("DevicePerseusScan::scan: device #%d firmware download error: %s", deviceIndex, perseus_errorstr());
|
||||
perseus_close(descr);
|
||||
done = false;
|
||||
continue;
|
||||
}
|
||||
else
|
||||
|
@ -29,10 +29,10 @@ if(LIBUSB_FOUND AND LIBBLADERF_FOUND)
|
||||
add_subdirectory(bladerf2input)
|
||||
endif(LIBUSB_FOUND AND LIBBLADERF_FOUND)
|
||||
|
||||
if(LIBUSB_FOUND AND NOT APPLE)
|
||||
if(LIBUSB_FOUND)
|
||||
add_subdirectory(fcdpro)
|
||||
add_subdirectory(fcdproplus)
|
||||
endif(LIBUSB_FOUND AND NOT APPLE)
|
||||
endif(LIBUSB_FOUND)
|
||||
|
||||
find_package(LibHACKRF)
|
||||
if(LIBUSB_FOUND AND LIBHACKRF_FOUND)
|
||||
|
@ -46,7 +46,6 @@ add_library(inputfcdpro SHARED
|
||||
|
||||
target_link_libraries(inputfcdpro
|
||||
${QT_LIBRARIES}
|
||||
asound
|
||||
fcdhid
|
||||
fcdlib
|
||||
sdrbase
|
||||
|
@ -46,7 +46,6 @@ add_library(inputfcdproplus SHARED
|
||||
|
||||
target_link_libraries(inputfcdproplus
|
||||
${QT_LIBRARIES}
|
||||
asound
|
||||
fcdhid
|
||||
fcdlib
|
||||
sdrbase
|
||||
|
Loading…
Reference in New Issue
Block a user