Merge branch 'release-2.5.0' of bitbucket.org:k1jt/wsjtx into release-2.5.0

This commit is contained in:
Joe Taylor 2021-07-07 11:00:38 -04:00
commit dd149231e8
3 changed files with 8 additions and 0 deletions

2
NEWS
View File

@ -26,6 +26,8 @@ MAP65:
decodes. decodes.
- Provide access to Release Notes from the Help menu - Provide access to Release Notes from the Help menu
- Correct the formatting of Q65 messages to livecq - Correct the formatting of Q65 messages to livecq
- Repair an Xpol polarization finding hang
- Build MAP65 to start without an attached console
WSJT-X: WSJT-X:
- Repair a long standing defect that caused UDP Protocol Heartbeat - Repair a long standing defect that caused UDP Protocol Heartbeat

View File

@ -26,6 +26,8 @@ MAP65:
decodes. decodes.
- Provide access to Release Notes from the Help menu - Provide access to Release Notes from the Help menu
- Correct the formatting of Q65 messages to livecq - Correct the formatting of Q65 messages to livecq
- Repair an Xpol polarization finding hang
- Build MAP65 to start without an attached console
WSJT-X: WSJT-X:
- Repair a long standing defect that caused UDP Protocol Heartbeat - Repair a long standing defect that caused UDP Protocol Heartbeat

View File

@ -51,6 +51,10 @@ add_executable (map65 ${map65_CXXSRCS} ${map65_CSRCS} ${map65_GENUISRCS} map65.r
target_include_directories (map65 PRIVATE ${CMAKE_SOURCE_DIR} ${FFTW3_INCLUDE_DIRS}) target_include_directories (map65 PRIVATE ${CMAKE_SOURCE_DIR} ${FFTW3_INCLUDE_DIRS})
target_link_libraries (map65 wsjt_qt m65impl ${FFTW3_LIBRARIES} Qt5::Widgets Qt5::Network Portaudio::Portaudio Usb::Usb) target_link_libraries (map65 wsjt_qt m65impl ${FFTW3_LIBRARIES} Qt5::Widgets Qt5::Network Portaudio::Portaudio Usb::Usb)
if (WSJT_CREATE_WINMAIN)
set_target_properties (map65 PROPERTIES WIN32_EXECUTABLE ON)
endif (WSJT_CREATE_WINMAIN)
if (WIN32) if (WIN32)
install ( install (
CODE "get_filename_component (_path \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wsjtx_dir.txt\" REALPATH) CODE "get_filename_component (_path \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wsjtx_dir.txt\" REALPATH)