|
 |
c5b466f |
--- a/wsjtx/CMakeLists.txt
|
|
|
c5b466f |
+++ b/wsjtx/CMakeLists.txt
|
|
 |
b448ee1 |
@@ -850,7 +850,7 @@ find_program(ETAGS etags)
|
|
|
c5b466f |
#
|
|
|
c5b466f |
# Boost
|
|
|
c5b466f |
#
|
|
|
c5b466f |
-set (Boost_NO_SYSTEM_PATHS TRUE)
|
|
|
c5b466f |
+set (Boost_NO_SYSTEM_PATHS TRUE CACHE BOOL "")
|
|
|
c5b466f |
if (Boost_NO_SYSTEM_PATHS)
|
|
|
c5b466f |
set (BOOST_ROOT ${PROJECT_SOURCE_DIR}/boost)
|
|
|
c5b466f |
endif ()
|
|
|
b448ee1 |
@@ -869,7 +869,7 @@ find_package (FFTW3 COMPONENTS double si
|
|
|
c5b466f |
#
|
|
|
c5b466f |
# libhamlib setup
|
|
|
c5b466f |
#
|
|
|
c5b466f |
-set (hamlib_STATIC 1)
|
|
|
c5b466f |
+set (hamlib_STATIC 1 CACHE BOOL "")
|
|
|
c5b466f |
find_package (hamlib 3 REQUIRED)
|
|
|
c5b466f |
find_program (RIGCTL_EXE rigctl)
|
|
|
c5b466f |
find_program (RIGCTLD_EXE rigctld)
|
|
|
b448ee1 |
@@ -1372,7 +1372,8 @@ else ()
|
|
|
c067aca |
)
|
|
|
c067aca |
endif ()
|
|
|
c067aca |
endif ()
|
|
|
c067aca |
-qt5_use_modules (wsjtx SerialPort) # not sure why the interface link library syntax above doesn't work
|
|
|
c067aca |
+find_package(Qt5SerialPort)
|
|
|
c067aca |
+target_link_libraries (wsjtx Qt5::SerialPort) # not sure why the interface link library syntax above doesn't work
|
|
|
c067aca |
|
|
|
c067aca |
# make a library for WSJT-X UDP servers
|
|
|
c067aca |
# add_library (wsjtx_udp SHARED ${UDP_library_CXXSRCS})
|
|
|
b448ee1 |
@@ -1393,7 +1394,7 @@ set_target_properties (wsjtx_udp-static
|
|
|
c067aca |
)
|
|
|
c067aca |
target_compile_definitions (wsjtx_udp-static PUBLIC UDP_STATIC_DEFINE)
|
|
|
c067aca |
#qt5_use_modules (wsjtx_udp Network)
|
|
|
c067aca |
-qt5_use_modules (wsjtx_udp-static Network Gui)
|
|
|
c067aca |
+target_link_libraries (wsjtx_udp-static Qt5::Network Qt5::Gui)
|
|
|
c067aca |
generate_export_header (wsjtx_udp-static BASE_NAME udp)
|
|
|
c067aca |
|
|
|
c067aca |
add_executable (udp_daemon UDPExamples/UDPDaemon.cpp UDPExamples/udp_daemon.rc ${WSJTX_ICON_FILE})
|
|
|
b448ee1 |
@@ -1471,27 +1472,6 @@ install (TARGETS ft8code jt65code qra64c
|
|
|
c5b466f |
)
|
|
|
ac5d525 |
endif(WSJT_BUILD_UTILS)
|
|
|
c5b466f |
|
|
|
c5b466f |
-install (PROGRAMS
|
|
|
c5b466f |
- ${RIGCTL_EXE}
|
|
|
c5b466f |
- DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
|
c5b466f |
- #COMPONENT runtime
|
|
|
c5b466f |
- RENAME rigctl-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
|
|
|
c5b466f |
- )
|
|
|
c5b466f |
-
|
|
|
c5b466f |
-install (PROGRAMS
|
|
|
c5b466f |
- ${RIGCTLD_EXE}
|
|
|
c5b466f |
- DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
|
c5b466f |
- #COMPONENT runtime
|
|
|
c5b466f |
- RENAME rigctld-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
|
|
|
c5b466f |
- )
|
|
|
c5b466f |
-
|
|
|
73cb35b |
-install (PROGRAMS
|
|
|
73cb35b |
- ${RIGCTLCOM_EXE}
|
|
|
73cb35b |
- DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
|
73cb35b |
- #COMPONENT runtime
|
|
|
73cb35b |
- RENAME rigctlcom-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
|
|
|
73cb35b |
- )
|
|
|
73cb35b |
-
|
|
|
c5b466f |
install (FILES
|
|
|
c5b466f |
README
|
|
|
c5b466f |
COPYING
|
|
|
c5b466f |
--- a/wsjtx/HamlibTransceiver.hpp
|
|
|
c5b466f |
+++ b/wsjtx/HamlibTransceiver.hpp
|
|
|
ac5d525 |
@@ -1,6 +1,10 @@
|
|
|
ac5d525 |
#ifndef HAMLIB_TRANSCEIVER_HPP_
|
|
|
ac5d525 |
#define HAMLIB_TRANSCEIVER_HPP_
|
|
|
c5b466f |
|
|
|
c5b466f |
+#ifndef RIG_PASSBAND_NOCHANGE
|
|
|
c5b466f |
+#define RIG_PASSBAND_NOCHANGE RIG_PASSBAND_NORMAL
|
|
|
c5b466f |
+#endif
|
|
|
c5b466f |
+
|
|
|
ac5d525 |
#include <tuple>
|
|
|
ac5d525 |
|
|
|
ac5d525 |
#include <QString>
|