VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-15 12:51:49 -05:00
Code Issues Projects Releases Wiki Activity

Add Qt WebEngine dependency

Browse Source
This commit is contained in:
Jon Beniston 2022-02-04 20:56:47 +00:00
parent cc93815414
commit 854709f4fa
6 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -80,7 +80,7 @@ for:
sudo apt-get -y install build-essential cmake git xxd \ sudo apt-get -y install build-essential cmake git xxd \
devscripts fakeroot debhelper libfftw3-dev qtbase5-dev libqt5opengl5-dev \ devscripts fakeroot debhelper libfftw3-dev qtbase5-dev libqt5opengl5-dev \
qttools5-dev qttools5-dev-tools qtmultimedia5-dev libqt5multimedia5-plugins libqt5websockets5-dev \ qttools5-dev qttools5-dev-tools qtmultimedia5-dev libqt5multimedia5-plugins libqt5websockets5-dev \
libqt5quick5 \ libqt5quick5 qtwebengine5-dev \
qml-module-qtlocation qml-module-qtpositioning qml-module-qtquick-window2 qml-module-qtquick-dialogs \ qml-module-qtlocation qml-module-qtpositioning qml-module-qtquick-window2 qml-module-qtquick-dialogs \
qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-layouts qml-module-qtgraphicaleffects \ qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-layouts qml-module-qtgraphicaleffects \
libqt5serialport5-dev qtdeclarative5-dev qtpositioning5-dev qtlocation5-dev \ libqt5serialport5-dev qtdeclarative5-dev qtpositioning5-dev qtlocation5-dev \

10
CMakeLists.txt
View File

@ -336,7 +336,10 @@ if (BUILD_GUI)
Quick Quick
QuickWidgets QuickWidgets
Location Location
TextToSpeech) TextToSpeech
WebEngine
WebEngineCore
WebEngineWidgets)
endif() endif()
# other requirements # other requirements
@ -597,6 +600,11 @@ if(WIN32)
windeployqt(${CMAKE_PROJECT_NAME} ${SDRANGEL_BINARY_BIN_DIR} ${PROJECT_SOURCE_DIR}/sdrgui/resources) windeployqt(${CMAKE_PROJECT_NAME} ${SDRANGEL_BINARY_BIN_DIR} ${PROJECT_SOURCE_DIR}/sdrgui/resources)
endif() endif()
# Install debug symbols
if (WIN32)
install(FILES $<TARGET_PDB_FILE:${CMAKE_PROJECT_NAME}> CONFIGURATIONS Debug RelWithDebInfo DESTINATION ${INSTALL_BIN_DIR} )
endif()
# install documentation # install documentation
# TODO maybe install readme for every plugins # TODO maybe install readme for every plugins
install(FILES ${CMAKE_SOURCE_DIR}/Readme.md DESTINATION ${INSTALL_DOC_DIR}) install(FILES ${CMAKE_SOURCE_DIR}/Readme.md DESTINATION ${INSTALL_DOC_DIR})

5
cmake/cpack/CMakeLists.txt
View File

@ -247,7 +247,9 @@ elseif(WIN32 OR MINGW)
if(BUILD_GUI) if(BUILD_GUI)
install(CODE " install(CODE "
include(BundleUtilities) include(BundleUtilities)
fixup_bundle(\"${SDRANGEL_BINARY_BIN_DIR}/sdrangel${CMAKE_EXECUTABLE_SUFFIX}\" \"\" \"${WINDOWS_FIXUP_BUNDLE_LIB_DIRS}\") # 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) " COMPONENT Runtime)
elseif(BUILD_SERVER) elseif(BUILD_SERVER)
install(CODE " install(CODE "
@ -295,6 +297,7 @@ elseif(WIN32 OR MINGW)
install(DIRECTORY "${OPENSSL_DLL_DIR}/" DESTINATION "${INSTALL_LIB_DIR}" install(DIRECTORY "${OPENSSL_DLL_DIR}/" DESTINATION "${INSTALL_LIB_DIR}"
FILES_MATCHING PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}") FILES_MATCHING PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}")
install(CODE " install(CODE "
# remove *.lib files # remove *.lib files
# TODO find a better way # TODO find a better way

1
debian/control vendored
View File

@ -29,6 +29,7 @@ Build-Depends: debhelper (>= 9),
qtdeclarative5-dev, qtdeclarative5-dev,
qtpositioning5-dev, qtpositioning5-dev,
qtlocation5-dev, qtlocation5-dev,
qtwebengine5-dev,
libusb-1.0-0-dev, libusb-1.0-0-dev,
libboost-all-dev, libboost-all-dev,
libasound2-dev, libasound2-dev,

2
plugins/channelrx/CMakeLists.txt
View File

@ -26,7 +26,7 @@ if(DAB_FOUND AND ZLIB_FOUND AND FAAD_FOUND)
add_subdirectory(demoddab) add_subdirectory(demoddab)
endif() endif()
if(APT_FOUND) if(APT_FOUND AND SGP4_FOUND)
add_subdirectory(demodapt) add_subdirectory(demodapt)
endif() endif()

2
plugins/feature/CMakeLists.txt
View File

@ -4,7 +4,7 @@ if (Qt5SerialPort_FOUND)
add_subdirectory(gs232controller) add_subdirectory(gs232controller)
endif() endif()
if (Qt5Quick_FOUND AND Qt5QuickWidgets_FOUND AND Qt5Positioning_FOUND AND Qt5Location_FOUND) if (Qt5Quick_FOUND AND Qt5QuickWidgets_FOUND AND Qt5Positioning_FOUND AND Qt5Location_FOUND AND Qt5WebEngine_FOUND)
add_subdirectory(map) add_subdirectory(map)
endif() endif()
if (Qt5Quick_FOUND AND Qt5QuickWidgets_FOUND AND Qt5Positioning_FOUND) if (Qt5Quick_FOUND AND Qt5QuickWidgets_FOUND AND Qt5Positioning_FOUND)