diff --git a/CMakeLists.txt b/CMakeLists.txt index e3f4fe984..1ab93e878 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -882,6 +882,9 @@ set (CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}") set (CPACK_PACKAGE_VERSION_MAJOR ${WSJTX_VERSION_MAJOR}) set (CPACK_PACKAGE_VERSION_MINOR ${WSJTX_VERSION_MINOR}) set (CPACK_PACKAGE_VERSION_PATCH ${WSJTX_VERSION_PATCH}) +if (WSJTX_RC) + set (CPACK_PACKAGE_VERSION_PATCH ${CPACK_PACKAGE_VERSION_PATCH}-rc${WSJTX_RC}) +endif (WSJTX_RC) if (WIN32) set (CPACK_GENERATOR "NSIS") diff --git a/Versions.cmake b/Versions.cmake index 2984af67d..a4771ef03 100644 --- a/Versions.cmake +++ b/Versions.cmake @@ -2,7 +2,7 @@ set (WSJTX_VERSION_MAJOR 1) set (WSJTX_VERSION_MINOR 4) set (WSJTX_VERSION_PATCH 0) -#set (WSJTX_RC 1) +set (WSJTX_RC 1) set (WSJTX_VERSION_IS_RELEASE 0) set (CONFIG_TEST_VERSION_MAJOR 0) diff --git a/revision_utils.cpp b/revision_utils.cpp index dd6c3c543..9f93c51e5 100644 --- a/revision_utils.cpp +++ b/revision_utils.cpp @@ -1,5 +1,7 @@ #include "revision_utils.hpp" +#include + #include #include @@ -73,8 +75,14 @@ QString revision (QString const& svn_rev_string) QString program_title (QString const& revision) { #if defined (CMAKE_BUILD) - return QCoreApplication::applicationName () + " v" WSJTX_STRINGIZE (WSJTX_VERSION_MAJOR) "." WSJTX_STRINGIZE (WSJTX_VERSION_MINOR) "." WSJTX_STRINGIZE (WSJTX_VERSION_PATCH) " " + revision + " by K1JT"; + QString id {QCoreApplication::applicationName () + " v" WSJTX_STRINGIZE (WSJTX_VERSION_MAJOR) "." WSJTX_STRINGIZE (WSJTX_VERSION_MINOR) "." WSJTX_STRINGIZE (WSJTX_VERSION_PATCH)}; + +# if defined (WSJTX_RC) + id += "-rc" WSJTX_STRINGIZE (WSJTX_RC); +# endif + #else - return "WSJT-X v1.4 " + revision + " by K1JT"; + QString id {"WSJT-X v1.4"; #endif + return id + " " + revision + " by K1JT"; }