On 15/06/18 01:37, Bill Somerville wrote:
On 14/06/2018 22:25, Bill Somerville wrote:
Hi Barry,
we are moving to git, part of that involved reorganizing the svn repo.
Each project now has a top level directory in the repo with a trunk
and optionally a branches and tags directory alongside. So the
wsjtx-superbuild location has moved to
svn://svn.code.sf.net/p/wsjt/wsjt/wsjtx-superbuild/trunk if you have
it checked out then you can relocate it by simply typing:
svn switch ^/wsjtx-superbuild/trunk
from within the workspace.
Hi Barry and other users of the wsjtx-superbuild CMake project,
I have updated wsjtx-superbuild script to use the new WSJT-X git
repository on SourceForge. The updated wsjtx-superbuild project is also
hosted in a git repository in the WSJT SourceForge project. The project
is here:
https://sourceforge.net/p/wsjt/wsjtx-superbuild/ci/master/tree/
and you can make a read-only clone using git as follows:
git clone git://git.code.sf.net/p/wsjt/wsjtx-superbuild
The CMake script itself has been somewhat simplified, it still takes a
single configuration argument of WSJTX_TAG but the value is now simply
the WSJT-X tag name. If this argument is omitted then the stable branch
will be built, the stable branch is the nearest equivalent of the old
svn development trunk. Building a source tarball from other branches is
not currently supported. So for example to make a source tarball of
WSJT-X v1.9.1, e.g. for use on a distribution build server, you might do
the following:
mkdir ~/wsjtx-superbuild
cd ~/wsjtx-superbuild
git clone git://git.code.sf.net/p/wsjt/wsjtx-superbuild src
mkdir build
cd build
cmake -D WSJTX_TAG=wsjtx-1.9.1 ../src
cmake --build . --target source
From then on the generated tarball and the instructions printed by the
above CMake build should be followed.
73
Bill
G4WJS.
Thanks Bill,
That works fine using git.
There is another issue due to our migration to qt5-5.11.0.
It is fixed (as far as a completed build goes) with the following patch
provided by one of our qt stack maintainers:
diff -Nru wsjtx/CMakeLists.txt wsjtx/CMakeLists.txt
--- wsjtx/CMakeLists.txt 2018-05-31 02:29:47.000000000 +0200
+++ wsjtx/CMakeLists.txt 2018-06-04 07:04:16.849857440 +0200
@@ -1343,7 +1343,8 @@
)
endif ()
endif ()
-qt5_use_modules (wsjtx SerialPort) # not sure why the interface link
library syntax above doesn't work
+find_package(Qt5SerialPort)
+target_link_libraries (wsjtx Qt5::SerialPort) # not sure why the
interface link library syntax above doesn't work
# make a library for WSJT-X UDP servers
# add_library (wsjtx_udp SHARED ${UDP_library_CXXSRCS})
@@ -1364,7 +1365,7 @@
)
target_compile_definitions (wsjtx_udp-static PUBLIC UDP_STATIC_DEFINE)
#qt5_use_modules (wsjtx_udp Network)
-qt5_use_modules (wsjtx_udp-static Network Gui)
+target_link_libraries (wsjtx_udp-static Qt5::Network Qt5::Gui)
generate_export_header (wsjtx_udp-static BASE_NAME udp)
add_executable (udp_daemon UDPExamples/UDPDaemon.cpp
UDPExamples/udp_daemon.rc ${WSJTX_ICON_FILE})
I have not run wsjtx built with this patch yet.
73
Barry
G4MKT
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
wsjt-devel mailing list
wsjt-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wsjt-devel
