refactor: VersionInfo is now part of common

src/CMakeLists.txt

@@ -3,8 +3,7 @@
 # SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
-include_directories(./lib)
+include_directories(./lib "${CMAKE_CURRENT_BINARY_DIR}/lib")
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/lib)
 
 add_subdirectory(lib)
 add_subdirectory(apps)

src/apps/deskflow-core/CoreArgParser.cpp

@@ -6,11 +6,11 @@
 
 #include "CoreArgParser.h"
 #include "CoreArgs.h"
-#include "VersionInfo.h"
 
 #include "common/Constants.h"
 #include "common/ExitCodes.h"
 #include "common/Settings.h"
+#include "common/VersionInfo.h"
 #include "deskflow/ProtocolTypes.h"
 
 const QString CoreArgParser::s_headerText = QStringLiteral("%1: %2\n").arg(kCoreBinName, kDisplayVersion);

src/apps/deskflow-daemon/deskflow-daemon.cpp

@@ -5,12 +5,12 @@
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
-#include "VersionInfo.h"
 #include "arch/Arch.h"
 #include "base/EventQueue.h"
 #include "base/Log.h"
 #include "common/ExitCodes.h"
 #include "common/Settings.h"
+#include "common/VersionInfo.h"
 #include "deskflow/DaemonApp.h"
 #include "deskflow/ipc/DaemonIpcServer.h"
 

src/apps/deskflow-gui/deskflow-gui.cpp

@@ -6,12 +6,12 @@
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
-#include "VersionInfo.h"
 #include "common/Constants.h"
 #include "common/ExitCodes.h"
 #include "common/I18N.h"
 #include "common/PlatformInfo.h"
 #include "common/UrlConstants.h"
+#include "common/VersionInfo.h"
 #include "gui/Diagnostic.h"
 #include "gui/MainWindow.h"
 #include "gui/Messages.h"

src/lib/CMakeLists.txt

@@ -3,8 +3,6 @@
 # SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
-configure_file(VersionInfo.h.in VersionInfo.h @ONLY)
-
 add_subdirectory(arch)
 add_subdirectory(base)
 add_subdirectory(client)

src/lib/common/CMakeLists.txt

@@ -7,6 +7,7 @@ if(WIN32)
 endif()
 
 configure_file(Constants.h.in Constants.h @ONLY)
+configure_file(VersionInfo.h.in VersionInfo.h @ONLY)
 
 add_library(common STATIC
   Enums.h
@@ -20,6 +21,7 @@ add_library(common STATIC
   QSettingsProxy.h
   UrlConstants.h
   ${CMAKE_CURRENT_BINARY_DIR}/Constants.h
+  ${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.h
 )
 
 target_link_libraries(common PUBLIC Qt6::Core)

src/lib/common/VersionInfo.h.in

@@ -9,6 +9,6 @@
 
 const auto kVersion = "@CMAKE_PROJECT_VERSION@";
 const auto kVersionGitSha = "@GIT_SHA_SHORT@";
-// clang-format off
+const auto kDisplayVersion = @CMAKE_PROJECT_VERSION_TWEAK@
-const auto kDisplayVersion = @CMAKE_PROJECT_VERSION_TWEAK@ ? "@CMAKE_PROJECT_VERSION@ (@GIT_SHA_SHORT@)" : "@CMAKE_PROJECT_VERSION_MAJOR@.@CMAKE_PROJECT_VERSION_MINOR@.@CMAKE_PROJECT_VERSION_PATCH@";
+                           ? "@CMAKE_PROJECT_VERSION@ (@GIT_SHA_SHORT@)"
-// clang-format on
+                           : "@CMAKE_PROJECT_VERSION_MAJOR@.@CMAKE_PROJECT_VERSION_MINOR@.@CMAKE_PROJECT_VERSION_PATCH@";

src/lib/gui/MainWindow.cpp

@@ -11,7 +11,6 @@
 
 #include "Diagnostic.h"
 #include "StyleUtils.h"
-#include "VersionInfo.h"
 
 #include "dialogs/AboutDialog.h"
 #include "dialogs/FingerprintDialog.h"
@@ -21,6 +20,7 @@
 #include "common/PlatformInfo.h"
 #include "common/Settings.h"
 #include "common/UrlConstants.h"
+#include "common/VersionInfo.h"
 #include "gui/Messages.h"
 #include "gui/TlsUtility.h"
 #include "gui/core/CoreProcess.h"

src/lib/gui/Messages.cpp

@@ -7,11 +7,11 @@
 #include "Messages.h"
 
 #include "Logger.h"
-#include "VersionInfo.h"
 
 #include "common/Enums.h"
 #include "common/Settings.h"
 #include "common/UrlConstants.h"
+#include "common/VersionInfo.h"
 
 #include <QCheckBox>
 #include <QMessageBox>

src/lib/gui/VersionChecker.cpp

@@ -6,8 +6,8 @@
 
 #include "VersionChecker.h"
 
-#include "VersionInfo.h"
 #include "common/Settings.h"
+#include "common/VersionInfo.h"
 
 #include <QLocale>
 #include <QNetworkAccessManager>

src/lib/gui/dialogs/AboutDialog.cpp

@@ -9,8 +9,8 @@
 #include "AboutDialog.h"
 #include "ui_AboutDialog.h"
 
-#include "VersionInfo.h"
 #include "common/Constants.h"
+#include "common/VersionInfo.h"
 
 #include <QClipboard>