Commit Graph

61 Commits

Author SHA1 Message Date
Bill Somerville
14ffa9f6cb
Reduce package finder diagnostic prints 2021-06-01 15:04:49 +01:00
Bill Somerville
2d68e857dc
Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration 2021-04-18 01:23:22 +01:00
Bill Somerville
a3334295ef
Revert to standard CMake BundleUtilities.cmake script
Fix some installation dependency finding issues.
2021-04-18 01:06:04 +01:00
Joe Taylor
dd1e2b98ce Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration 2021-04-17 09:04:10 -04:00
Joe Taylor
4a2378c163 Bill's fix to the hamlib CMake file. 2021-04-17 08:53:42 -04:00
Bill Somerville
8065f3b889
Another attempt to get cross platform package finding working 2021-04-17 03:08:06 +01:00
Bill Somerville
3591f13ff0
Hamlib package finder for static and dynamic linking on Windows 2021-04-17 02:06:47 +01:00
Bill Somerville
bd9c7a5785
Switch to recommended package finder naming conventions 2021-04-15 02:56:00 +01:00
Bill Somerville
5946eaf615
Windows compatibility for the portaudio package finder 2021-04-14 21:59:00 +01:00
Bill Somerville
a44959962c
Diagnostics for port audio package finder on macOS 2021-04-14 21:49:23 +01:00
Bill Somerville
df8f43f0b7
Temporary find portaudio package diagnostics 2021-04-13 18:43:59 +01:00
Bill Somerville
a721be37ff
Fixing macOS linking of map65 2021-04-13 14:28:44 +01:00
Bill Somerville
6dac83abe2
Temporary diagnstics 2021-04-13 14:18:26 +01:00
Bill Somerville
00f1d7577a
Update hamlib and libusb package finders for Linux 2021-04-13 02:02:49 +01:00
Bill Somerville
63e485e819
Updated CMake finders, working on Windows & supporting dynamic hamlib 2021-04-12 22:33:46 +01:00
Joe Taylor
7b4e0e41e4 Update to Findlibusb.cmake 2021-04-12 12:19:22 -04:00
Bill Somerville
17ba3e4a06
More flexible libusb-1.0 package finder script 2021-04-11 23:04:07 +01:00
Bill Somerville
b3b70a81cd
Updated LibFindMacros.cmake
Allowing much simplified CMake package  finder scripts, also moving to
finders creating imported targets.
2021-04-11 22:03:56 +01:00
Bill Somerville
56c92c55fb
Updated CMake finders and changes to build map65 on Linux 2021-04-11 15:29:15 +01:00
Bill Somerville
74bd3c1d0c
Changes to integrate into WSJT-X build system
A  separate install  of the  portaudio  library is  now required,  see
"doc/building on MS Windows.txt" for a suitable recipe.

The map65  code base  is still  MS Windows specific  in some  areas so
don't expect successful builds on Linux or macOS yet.
2021-04-10 12:29:34 +01:00
Bill Somerville
5f2ba00bb8
Add Version Info resources to Windows executables where needed.
Version information  and more  in the  Windows resources  for main
    applications, installer and un-installer.

    Update  CMake   policies  for  new  project()   command,  and  DEB
    dependency changes

    Support  older  libgfortran  packages,  and  other  Linux  package
    dependencies.

    Use new project description file in Debian packaging.

    Linux packaging dependency adjustments  for Debian style packages,
    including  a machine  readable  Debian  copyright format,  project
    description in separate file for  CPack compatibility, and use for
    DEB packaging.

    Configure check for need to link libm Standard C Math Library.

    CMake compatibility for <3.17.
2020-10-10 13:38:15 +01:00
Bill Somerville
d522239492
CMake v3.17 compatability 2020-08-22 11:58:39 +01:00
Bill Somerville
f00f9bbeb9
Revert "CMake 3.17 compatibility"
This reverts commit 49366d0455.
2020-08-22 11:57:44 +01:00
Bill Somerville
49366d0455
CMake 3.17 compatibility 2020-08-22 02:40:33 +01:00
Bill Somerville
ddbf22b3b9
Reduce source control local changes warning to status message
This avoids IDEs detecting a build error on this notification.
2020-06-15 22:59:00 +01:00
Bill Somerville
8035880c45
CMake updates to remove warnings when using recent CMake versions 2019-05-28 19:00:13 +01:00
Bill Somerville
ff1d3efab4 Changes to support x64 Windows builds in preparation for Qt v5.12 2019-01-15 12:09:10 +00:00
Bill Somerville
b7b30452b1 Fix CMake Hamlib package finder on systems that use */lib64 LIBDIRS 2018-11-15 01:29:55 +00:00
Bill Somerville
86ee632dc7 Fix issue with source tarball builds
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/wsjtx/trunk@8742 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2018-05-31 00:09:28 +00:00
Bill Somerville
9c42a42219 Bump development version
Also first stage of allowing for builds from a git repository.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/wsjtx/trunk@8732 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2018-05-27 11:40:12 +00:00
Bill Somerville
2b918959c9 Fix an issue with building in a sub-directory of a git-svn checkout
Thanks to Mike NF4E for the  original issue report and patch that this
change was based on.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8072 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-09-03 23:46:35 +00:00
Bill Somerville
3cefb34c46 Remove testing diagnostic message
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6584 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-04-06 17:11:11 +00:00
Bill Somerville
b9df9eff69 Adjust CMake Hamlib finder for latest version
Hamlib now used  libusb-1.0 and since that is available  on Windows we
can now build with it across platforms. This change allows for that if
the custom USB backends are configured in Hamlib.

As it looks  like Hamlib v3.1 will be suitable  for WSJT-X this change
also puts  in place what  is needed to  link to a  Hamlib SO/DLL/DYLIB
when required. This is switched on  by not defining the CMake variable
hamlib_STATIC. This could  be used on Windows and Mac  but Linux still
must have  Hamlib statically linked  due to repository  versions being
too old.

For  now  Hamlib  remains  statically linked  for  consistency  across
platforms.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6581 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-04-06 17:10:46 +00:00
Bill Somerville
91b5edcca1 Banish KVASD
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6129 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-18 22:53:37 +00:00
Bill Somerville
eca29808ec Switch to version of GetPrerequisites.cmake submitted to CMake
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5743 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-07-31 11:14:31 +00:00
Bill Somerville
e54bd9441a Temporary fix for dumpbin.exe issues with MinGW 4.9
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5729 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-07-28 18:12:55 +00:00
Bill Somerville
c9fdb8d80d Remove unused script for downloading the user guide
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5468 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-05-29 23:10:38 +00:00
Bill Somerville
a6566af362 Fix a defect in the FFTW3 finder
It now does what it promises by setting FFTW3_INCLUDE_DIRS.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5360 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-05-12 15:27:05 +00:00
Bill Somerville
0f72c3fd9b Abandon getting changeset revision number from svn keyword expansion
Subversion keyword expansion of $Rev:$ in  a file is hopeless as it is
impossible to  coordinate with  a release. Revert  to an  empty string
when it can't be discovered with svn info etc..

Further changes to the way verion and revision numbers are generated

Local builds from  source tar balls or the  two phase wsjtx-superbuild
no longer specify  any revision, just the version  number. Since these
sort  of builds  are  expected  to be  release  candidates or  release
versions the revision (svn changeset  number) is implicit from the svn
tag of the version.

Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4986 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-22 00:20:42 +00:00
Bill Somerville
8c377b9c87 The CMake FFTW3 finder should not look for a threaded library on Windows
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4918 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-01-31 11:37:01 +00:00
Bill Somerville
cfec462e73 Don't try and generate an MD5 hash on a missing kvasd binary
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4831 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-12-17 00:55:00 +00:00
Bill Somerville
c70f523952 Optimized kvasd download in build
The kvasd binary  need only be downloaded  if the MD5 hash  for it has
changed.

Also fixed a defect in the status check of the MD5 hash download.

Also switched to HTTP protocol as  it is quick and gives clearer error
messages.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4830 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-12-16 17:58:01 +00:00
Bill Somerville
7eb9913324 Allow for errors reading kvasd MD5 hash file during build downloads
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4829 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-12-16 17:19:38 +00:00
Bill Somerville
46064e3af3 Add on-line KVASD install to Windows NSIS installer
To comply  with the  WSJT_X GPL  v3 license,  the closed  source KVASD
executable  must  be  delivered   separately  and  optionally  to  end
users. To facilitate  this a new install option has  been added to the
Windows  installer  to install  KVASD  by  downloading it  at  install
time. The installer  first downloads the KVASD EULA  from the Internet
and presents it  to the user for reading and  agreement.  If agreement
is  given  the  KVASD  binary  is downloaded  from  the  Internet  and
checksummed using an  MD5 hash, if that passes, it  is installed along
with WSJT-X.  An  uninstall record is also written to  ensure that, if
installed, KVASD will be un-installed if WSJT-X is un-installed.

To facilitate this enhancment to the NSIS installer the standard CPack
NSIS  installer script  template has  been overridden  with a  project
specific version.   This version also  implements the more  modern and
recomended nsDialogs mechanism for  installer custom page construction
including the install options page. See CMake/Modules/NSIS.template.in
for  details   and  CMakeCPackOptions.cmake.in   for  usage   in  this
installer.

Merged from branch wsjtx-1.4.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4663 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-27 17:17:19 +00:00
Bill Somerville
58119734f9 Increase web download timeouts to 2 minutes
User manual and kvasd downloads are occasionally timing out with a 10s
timeout.




git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4458 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-02 20:46:57 +00:00
Bill Somerville
ef35c0bd48 Use correct svn revision in program name text
The latest revision rather than the revision of the last change to the
current working set was being used in the program name text as seen in
the "About" window and reported to PSKReporter.

Also removed a redundant old file.

Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4424 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-01 17:11:28 +00:00
Bill Somerville
ffa6305b98 Better version identification.
An  ambiguity  existed  between  release  candidates  and  development
versions  as there  was no  definitive identification  for development
versions.

Added a  new version number  suffix of  '-devel' which appears  if the
release candidate number is missing  or zero in Versions.cmake and the
revision is not marked as a release version, also in Versions.cmake.

Also re-factored setting of version number suffiexes to a single place
in in CMake/VersionCompute.cmake.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4422 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-01 15:57:43 +00:00
Bill Somerville
d4e55a093d Add local HTML help file to help menu.
So that a manual can be viewed without an Internet connection a second
manual action has been added to  the WSJT_X help menu. This shells out
to the default web browser with a local file target.

The build has been enhanced to install and package the current version
of the  HTML user manual  as downloaded from  the project web  site at
build time

The package  file locations have  been adjusted to be  compatible with
the QStandardPaths  class so that  its locate()  method can be  used to
portably access resources like this local help file

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4359 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-24 23:46:32 +00:00
Bill Somerville
d9532543b0 Changed MD5 checksum for kvasd download to reflect new stripped
version of the binary.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4039 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-04-18 13:38:13 +00:00
Bill Somerville
ed2de0ed08 Add some useful messages to build output and remove some confusing
output.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4037 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-04-16 18:08:32 +00:00