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

pull/1418/head
Jon Beniston 2022-09-17 20:33:48 +01:00
commit aa84e2d0f6
5 zmienionych plików z 13 dodań i 9 usunięć

Wyświetl plik

@ -20,17 +20,17 @@ environment:
# -DBUILD_SERVER=OFF \
# -DCMAKE_PREFIX_PATH=C:\\Qt\\5.15.2\\msvc2019_64;C:\\Libraries\\boost_1_73_0"
# CMAKE_GENERATOR: Ninja
- TARGET: ubuntu2004prod
- TARGET: ubuntu2204prod
APPVEYOR_BUILD_WORKER_CLOUD: nasrock Docker
APPVEYOR_BUILD_WORKER_IMAGE: Linux
CC: "gcc-9"
CXX: "g++-9"
CC: "gcc-11"
CXX: "g++-11"
CMAKE_CUSTOM_OPTIONS: "-DCMAKE_BUILD_TYPE=Release \
-DARCH_OPT=nehalem \
-DDEBUG_OUTPUT=ON \
-DENABLE_EXTERNAL_LIBRARIES=ON \
-DBUILD_SERVER=OFF"
- TARGET: ubuntu2004docker
- TARGET: ubuntu2204docker
APPVEYOR_BUILD_WORKER_CLOUD: nasrock
APPVEYOR_BUILD_WORKER_IMAGE: Linux
APPVEYOR_CONSOLE_DISABLE_PTY: true
@ -68,7 +68,7 @@ for:
# branch: master # release from master branch only
- matrix:
only:
- TARGET: ubuntu2004prod
- TARGET: ubuntu2204prod
clone_folder: /home/appveyor/projects
cache:
- $HOME/external/
@ -90,7 +90,7 @@ for:
libopus-dev libcodec2-dev libairspy-dev libhackrf-dev \
libbladerf-dev libsoapysdr-dev libiio-dev libuhd-dev \
python3-mako python3-cheetah python3-numpy \
autoconf automake libtool ninja-build libclang1-9
autoconf automake libtool ninja-build libclang1-11
- sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES=ON" ]]; then bash cmake/ci/build_cm256cc.sh; fi
- sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES=ON" ]]; then bash cmake/ci/build_mbelib.sh; fi
- sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES=ON" ]]; then bash cmake/ci/build_serialdv.sh; fi
@ -128,7 +128,7 @@ for:
branch: master # release from master branch only
- matrix:
only:
- TARGET: ubuntu2004docker
- TARGET: ubuntu2204docker
before_build:
- git clone https://github.com/f4exb/sdrangel-docker.git
- cd sdrangel-docker

Wyświetl plik

@ -216,7 +216,7 @@ elseif(WIN32 OR MINGW)
if(BUILD_GUI)
install(CODE "
include(BundleUtilities)
# BundleUtilities.cmake verify_app fails unless we ignore QtWebEngineProcess.exe, as it fails if there are any "external" prerequisites
# BundleUtilities.cmake verify_app fails unless we ignore QtWebEngineProcess.exe, as it fails if there are any " external " prerequisites
# Should we ignore it? It appears to work OK if we do. Is there a better way?
fixup_bundle(\"${SDRANGEL_BINARY_BIN_DIR}/sdrangel${CMAKE_EXECUTABLE_SUFFIX}\" \"\" \"${WINDOWS_FIXUP_BUNDLE_LIB_DIRS}\" IGNORE_ITEM \"QtWebEngineProcess.exe\")
" COMPONENT Runtime)

Wyświetl plik

@ -83,7 +83,7 @@ endif()
if(ENABLE_CHANNELRX_DEMODDSD AND LIBDSDCC_FOUND AND LIBMBE_FOUND)
add_subdirectory(demoddsd)
endif(LIBDSDCC_FOUND AND LIBMBE_FOUND)
endif()
if (ENABLE_CHANNELRX_REMOTESINK AND CM256CC_FOUND AND (HAS_SSE3 OR HAS_NEON))
add_subdirectory(remotesink)

Wyświetl plik

@ -211,6 +211,8 @@ bool LimeSDROutputGUI::handleMessage(const Message& message)
} else {
ui->calibrationLabel->setStyleSheet("QLabel { background-color : red; }");
}
return true;
}
else if (LimeSDROutput::MsgReportStreamInfo::match(message))
{

Wyświetl plik

@ -198,6 +198,8 @@ bool LimeSDRInputGUI::handleMessage(const Message& message)
} else {
ui->calibrationLabel->setStyleSheet("QLabel { background-color : red; }");
}
return true;
}
else if (LimeSDRInput::MsgReportStreamInfo::match(message))
{