From fb7af6c696a9445f81ea8841ebbdf36ce3d64fc8 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sun, 16 Aug 2020 19:11:51 +0100 Subject: [PATCH] Further Linux dependency and install documentation updates --- CMakeLists.txt | 2 +- doc/user_guide/en/install-linux.adoc | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d414b0db1..87d0cb227 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1858,7 +1858,7 @@ set (CPACK_DEBIAN_PACKAGE_DEPENDS "libgfortran5 (>=10), libfftw3-single3 (>=3.3. set (CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) set (CPACK_RPM_PACKAGE_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR}) -set (CPACK_RPM_PACKAGE_REQUIRES "qt5-qtbase >= 5.13.2, qt5-qtserialport >= 5.13.2, qt5-qtmultimedia >= 5.13.2, qt5-qtsvg >= 5.13.2, libusbx >= 1.0.23, libgfortran >= 10.0.1, fftw-libs-double > 3.3.8, fftw-libs-single > 3.3.8") +set (CPACK_RPM_PACKAGE_REQUIRES "qt5-qtbase >= 5.13.2, qt5-qtserialport >= 5.13.2, qt5-qtmultimedia >= 5.13.2, qt5-qtsvg >= 5.13.2, libusbx >= 1.0.23, libgfortran >= 10.0.1, libgomp >= 10.0.1, fftw-libs-double > 3.3.8, fftw-libs-single > 3.3.8") set (CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION /usr/share/pixmaps /usr/share/applications /usr/share/man /usr/share/man1) configure_file ("${PROJECT_SOURCE_DIR}/CMakeCPackOptions.cmake.in" diff --git a/doc/user_guide/en/install-linux.adoc b/doc/user_guide/en/install-linux.adoc index c4b6ab155..0df12e5f5 100644 --- a/doc/user_guide/en/install-linux.adoc +++ b/doc/user_guide/en/install-linux.adoc @@ -43,9 +43,11 @@ sudo dpkg -P wsjtx You may also need to execute the following command in a terminal: [example] +.... sudo apt install libgfortran5 libqt5widgets5 libqt5network5 \ libqt5printsupport5 libqt5multimedia5-plugins libqt5serialport5 \ libqt5sql5-sqlite libfftw3-single3 libgomp1 libusb-1.0-0 +.... Fedora, CentOS, Red Hat, and other rpm-based systems: @@ -74,6 +76,8 @@ sudo rpm -e wsjtx You may also need to execute the following command in a terminal: [example] +.... sudo dnf install libgfortran fftw-libs-single qt5-qtbase \ qt5-qtmultimedia qt5-qtserialport fftw-libs-double \ - qt5-qtsvg qt5-qtserialport libgomp1 libusbx + qt5-qtsvg qt5-qtserialport libgomp libusbx +....