From c596f23a05dadb73bcdbed73d4e39d8c16ef4c1d Mon Sep 17 00:00:00 2001 From: Jordan Sherer Date: Mon, 9 Jul 2018 23:07:31 -0400 Subject: [PATCH] Added wsjtx-ft8call as output target --- CMakeCPackOptions.cmake.in | 12 ++++++------ CMakeLists.txt | 30 +++++++++++++++--------------- wsjtx-ft8call.desktop | 11 +++++++++++ 3 files changed, 32 insertions(+), 21 deletions(-) create mode 100644 wsjtx-ft8call.desktop diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in index 1924d1a..030f852 100644 --- a/CMakeCPackOptions.cmake.in +++ b/CMakeCPackOptions.cmake.in @@ -7,8 +7,8 @@ set (CPACK_PACKAGE_CONTACT "@PROJECT_CONTACT@") set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_SUMMARY_DESCRIPTION@") set (CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING") set (CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME}) -set (CPACK_PACKAGE_EXECUTABLES wsjtx "@PROJECT_NAME@") -set (CPACK_CREATE_DESKTOP_LINKS wsjtx) +set (CPACK_PACKAGE_EXECUTABLES wsjtx-ft8call "@PROJECT_NAME@") +set (CPACK_CREATE_DESKTOP_LINKS wsjtx-ft8call) set (CPACK_STRIP_FILES TRUE) # @@ -35,13 +35,13 @@ if (CPACK_GENERATOR MATCHES "NSIS") "@PROJECT_HOMEPAGE@" "@PROJECT_NAME@ Web Site" ) # Use the icon from wsjtx for add-remove programs - set (CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\wsjtx.exe") + set (CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\wsjtx-ft8call.exe") set (CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}") set (CPACK_NSIS_HELP_LINK "@PROJECT_MANUAL_DIRECTORY_URL@/@PROJECT_MANUAL@") set (CPACK_NSIS_URL_INFO_ABOUT "@PROJECT_HOMEPAGE@") set (CPACK_NSIS_CONTACT "${CPACK_PACKAGE_CONTACT}") - set (CPACK_NSIS_MUI_FINISHPAGE_RUN "wsjtx.exe") + set (CPACK_NSIS_MUI_FINISHPAGE_RUN "wsjtx-ft8call.exe") set (CPACK_NSIS_MODIFY_PATH ON) endif () @@ -65,9 +65,9 @@ if ("${CPACK_GENERATOR}" STREQUAL "WIX") # Reset CPACK_PACKAGE_VERSION to deal with WiX restriction. # But the file names still use the full CMake_VERSION value: set (CPACK_PACKAGE_FILE_NAME - "${CPACK_PACKAGE_NAME}-@wsjtx_VERSION@-${CPACK_SYSTEM_NAME}") + "${CPACK_PACKAGE_NAME}-@wsjtx-ft8call_VERSION@-${CPACK_SYSTEM_NAME}") set (CPACK_SOURCE_PACKAGE_FILE_NAME - "${CPACK_PACKAGE_NAME}-@wsjtx_VERSION@-Source") + "${CPACK_PACKAGE_NAME}-@wsjtx-ft8call_VERSION@-Source") if (NOT CPACK_WIX_SIZEOF_VOID_P) set (CPACK_WIX_SIZEOF_VOID_P "@CMAKE_SIZEOF_VOID_P@") diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d0a789..a23cbfb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ Change this to the newest SDK available that you can install on your system (10. Do not override this if you intend to build an official deployable installer.") endif (APPLE) -project (wsjtx C CXX Fortran) +project (wsjtx-ft8call C CXX Fortran) # # CMake policies @@ -1298,7 +1298,7 @@ else (${OPENMP_FOUND} OR APPLE) endif (${OPENMP_FOUND} OR APPLE) # build the main application -add_executable (wsjtx MACOSX_BUNDLE +add_executable (wsjtx-ft8call MACOSX_BUNDLE ${wsjtx_CXXSRCS} ${wsjtx_GENUISRCS} wsjtx.rc @@ -1307,10 +1307,10 @@ add_executable (wsjtx MACOSX_BUNDLE ) if (WSJT_CREATE_WINMAIN) - set_target_properties (wsjtx PROPERTIES WIN32_EXECUTABLE ON) + set_target_properties (wsjtx-ft8call PROPERTIES WIN32_EXECUTABLE ON) endif (WSJT_CREATE_WINMAIN) -set_target_properties (wsjtx PROPERTIES +set_target_properties (wsjtx-ft8call PROPERTIES MACOSX_BUNDLE_INFO_STRING "${WSJTX_DESCRIPTION_SUMMARY}" MACOSX_BUNDLE_ICON_FILE "${WSJTX_ICON_FILE}" MACOSX_BUNDLE_BUNDLE_VERSION ${wsjtx_VERSION} @@ -1321,27 +1321,27 @@ set_target_properties (wsjtx PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.k1jt.wsjtx" ) -target_include_directories (wsjtx PRIVATE ${FFTW3_INCLUDE_DIRS}) +target_include_directories (wsjtx-ft8call PRIVATE ${FFTW3_INCLUDE_DIRS}) if (APPLE) - target_link_libraries (wsjtx wsjt_fort wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES}) + target_link_libraries (wsjtx-ft8call wsjt_fort wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES}) else () - target_link_libraries (wsjtx wsjt_fort_omp wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES}) + target_link_libraries (wsjtx-ft8call wsjt_fort_omp wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES}) if (OpenMP_C_FLAGS) - set_target_properties (wsjtx PROPERTIES + set_target_properties (wsjtx-ft8call PROPERTIES COMPILE_FLAGS "${OpenMP_C_FLAGS}" LINK_FLAGS "${OpenMP_C_FLAGS}" ) endif () - set_target_properties (wsjtx PROPERTIES + set_target_properties (wsjtx-ft8call PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/fortran_modules_omp ) if (WIN32) - set_target_properties (wsjtx PROPERTIES + set_target_properties (wsjtx-ft8call PROPERTIES LINK_FLAGS -Wl,--stack,16777216 ) endif () endif () -qt5_use_modules (wsjtx SerialPort) # not sure why the interface link library syntax above doesn't work +qt5_use_modules (wsjtx-ft8call 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}) @@ -1386,18 +1386,18 @@ endif (WSJT_CREATE_WINMAIN) if (UNIX) if (NOT WSJT_SKIP_MANPAGES) add_subdirectory (manpages) - add_dependencies (wsjtx manpages) + add_dependencies (wsjtx-ft8call manpages) endif (NOT WSJT_SKIP_MANPAGES) if (NOT APPLE) add_subdirectory (debian) - add_dependencies (wsjtx debian) + add_dependencies (wsjtx-ft8call debian) endif (NOT APPLE) endif (UNIX) # # installation # -install (TARGETS wsjtx +install (TARGETS wsjtx-ft8call RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime BUNDLE DESTINATION . COMPONENT runtime ) @@ -1511,7 +1511,7 @@ if (NOT WIN32 AND NOT APPLE) # install a desktop file so wsjtx appears in the application start # menu with an icon install ( - FILES wsjtx.desktop message_aggregator.desktop + FILES wsjtx-ft8call.desktop message_aggregator.desktop DESTINATION share/applications #COMPONENT runtime ) diff --git a/wsjtx-ft8call.desktop b/wsjtx-ft8call.desktop new file mode 100644 index 0000000..a9fc687 --- /dev/null +++ b/wsjtx-ft8call.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Name=wsjtx-ft8call +Comment=Amateur Radio Weak Signal Operating +Exec=wsjtx-ft8call +Icon=wsjtx_icon +Terminal=false +X-MultipleArgs=false +Type=Application +Categories=AudioVideo;Audio;HamRadio; +StartupNotify=true