correctly commit patch?
This commit is contained in:
parent
0de597481c
commit
cc4f3c6c1d
@ -1,7 +1,7 @@
|
|||||||
diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
|
diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
|
||||||
--- wsjtx-orig/CMakeLists.txt 2023-01-28 17:43:05.586124507 +0100
|
--- wsjtx-orig/CMakeLists.txt 2023-01-28 17:43:05.586124507 +0100
|
||||||
+++ wsjtx/CMakeLists.txt 2023-01-28 17:56:07.108634912 +0100
|
+++ wsjtx/CMakeLists.txt 2023-01-28 17:56:07.108634912 +0100
|
||||||
@@ -122,7 +122,7 @@
|
@@ -122,7 +122,7 @@
|
||||||
option (WSJT_QDEBUG_TO_FILE "Redirect Qt debuging messages to a trace file.")
|
option (WSJT_QDEBUG_TO_FILE "Redirect Qt debuging messages to a trace file.")
|
||||||
option (WSJT_SOFT_KEYING "Apply a ramp to CW keying envelope to reduce transients." ON)
|
option (WSJT_SOFT_KEYING "Apply a ramp to CW keying envelope to reduce transients." ON)
|
||||||
option (WSJT_SKIP_MANPAGES "Skip *nix manpage generation.")
|
option (WSJT_SKIP_MANPAGES "Skip *nix manpage generation.")
|
||||||
@ -10,7 +10,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
|
|||||||
option (WSJT_RIG_NONE_CAN_SPLIT "Allow split operation with \"None\" as rig.")
|
option (WSJT_RIG_NONE_CAN_SPLIT "Allow split operation with \"None\" as rig.")
|
||||||
option (WSJT_TRACE_UDP "Debugging option that turns on UDP message protocol diagnostics.")
|
option (WSJT_TRACE_UDP "Debugging option that turns on UDP message protocol diagnostics.")
|
||||||
option (WSJT_BUILD_UTILS "Build simulators and code demonstrators." ON)
|
option (WSJT_BUILD_UTILS "Build simulators and code demonstrators." ON)
|
||||||
@@ -170,77 +170,7 @@
|
@@ -170,77 +170,7 @@
|
||||||
)
|
)
|
||||||
|
|
||||||
set (wsjt_qt_CXXSRCS
|
set (wsjt_qt_CXXSRCS
|
||||||
@ -88,7 +88,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
|
|||||||
)
|
)
|
||||||
|
|
||||||
set (wsjt_qtmm_CXXSRCS
|
set (wsjt_qtmm_CXXSRCS
|
||||||
@@ -1089,9 +1019,6 @@
|
@@ -1089,9 +1019,6 @@
|
||||||
if (WSJT_GENERATE_DOCS)
|
if (WSJT_GENERATE_DOCS)
|
||||||
add_subdirectory (doc)
|
add_subdirectory (doc)
|
||||||
endif (WSJT_GENERATE_DOCS)
|
endif (WSJT_GENERATE_DOCS)
|
||||||
@ -98,7 +98,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
|
|||||||
|
|
||||||
# build a library of package functionality (without and optionally with OpenMP support)
|
# build a library of package functionality (without and optionally with OpenMP support)
|
||||||
add_library (wsjt_cxx STATIC ${wsjt_CSRCS} ${wsjt_CXXSRCS})
|
add_library (wsjt_cxx STATIC ${wsjt_CSRCS} ${wsjt_CXXSRCS})
|
||||||
@@ -1357,10 +1284,7 @@
|
@@ -1357,10 +1284,7 @@
|
||||||
add_library (wsjt_qt STATIC ${wsjt_qt_CXXSRCS} ${wsjt_qt_GENUISRCS} ${GENAXSRCS})
|
add_library (wsjt_qt STATIC ${wsjt_qt_CXXSRCS} ${wsjt_qt_GENUISRCS} ${GENAXSRCS})
|
||||||
# set wsjtx_udp exports to static variants
|
# set wsjtx_udp exports to static variants
|
||||||
target_compile_definitions (wsjt_qt PUBLIC UDP_STATIC_DEFINE)
|
target_compile_definitions (wsjt_qt PUBLIC UDP_STATIC_DEFINE)
|
||||||
@ -110,7 +110,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
|
|||||||
|
|
||||||
# build a library of package Qt functionality used in Fortran utilities
|
# build a library of package Qt functionality used in Fortran utilities
|
||||||
add_library (fort_qt STATIC ${fort_qt_CXXSRCS})
|
add_library (fort_qt STATIC ${fort_qt_CXXSRCS})
|
||||||
@@ -1425,90 +1349,6 @@
|
@@ -1425,90 +1349,6 @@
|
||||||
add_subdirectory (map65)
|
add_subdirectory (map65)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
@ -201,7 +201,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
|
|||||||
generate_version_info (wsjtx_app_version_VERSION_RESOURCES
|
generate_version_info (wsjtx_app_version_VERSION_RESOURCES
|
||||||
NAME wsjtx_app_version
|
NAME wsjtx_app_version
|
||||||
BUNDLE ${PROJECT_BUNDLE_NAME}
|
BUNDLE ${PROJECT_BUNDLE_NAME}
|
||||||
@@ -1518,47 +1358,9 @@
|
@@ -1518,47 +1358,9 @@
|
||||||
add_executable (wsjtx_app_version AppVersion/AppVersion.cpp ${wsjtx_app_version_VERSION_RESOURCES})
|
add_executable (wsjtx_app_version AppVersion/AppVersion.cpp ${wsjtx_app_version_VERSION_RESOURCES})
|
||||||
target_link_libraries (wsjtx_app_version wsjt_qt)
|
target_link_libraries (wsjtx_app_version wsjt_qt)
|
||||||
|
|
||||||
@ -249,7 +249,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
|
|||||||
|
|
||||||
# install (TARGETS wsjtx_udp EXPORT udp
|
# install (TARGETS wsjtx_udp EXPORT udp
|
||||||
# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||||
@@ -1577,12 +1379,7 @@
|
@@ -1577,12 +1379,7 @@
|
||||||
# DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/wsjtx
|
# DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/wsjtx
|
||||||
# )
|
# )
|
||||||
|
|
||||||
@ -263,7 +263,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
|
|||||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
|
||||||
BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
|
BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
|
||||||
)
|
)
|
||||||
@@ -1595,38 +1392,6 @@
|
@@ -1595,38 +1392,6 @@
|
||||||
)
|
)
|
||||||
endif(WSJT_BUILD_UTILS)
|
endif(WSJT_BUILD_UTILS)
|
||||||
|
|
||||||
@ -302,7 +302,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
|
|||||||
install (FILES
|
install (FILES
|
||||||
cty.dat
|
cty.dat
|
||||||
cty.dat_copyright.txt
|
cty.dat_copyright.txt
|
||||||
@@ -1635,13 +1400,6 @@
|
@@ -1635,13 +1400,6 @@
|
||||||
#COMPONENT runtime
|
#COMPONENT runtime
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -316,7 +316,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
|
|||||||
#
|
#
|
||||||
# Mac installer files
|
# Mac installer files
|
||||||
#
|
#
|
||||||
@@ -1693,22 +1451,6 @@
|
@@ -1693,22 +1451,6 @@
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/wsjtx_config.h"
|
"${CMAKE_CURRENT_BINARY_DIR}/wsjtx_config.h"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user