From 163ec18730a11cd8c18513bab24fbcb6493f80e4 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Tue, 30 Dec 2025 10:43:12 -0500 Subject: [PATCH] refactor: VersionInfo is now part of common --- src/CMakeLists.txt | 3 +-- src/apps/deskflow-core/CoreArgParser.cpp | 2 +- src/apps/deskflow-daemon/deskflow-daemon.cpp | 2 +- src/apps/deskflow-gui/deskflow-gui.cpp | 2 +- src/lib/CMakeLists.txt | 2 -- src/lib/common/CMakeLists.txt | 2 ++ src/lib/{ => common}/VersionInfo.h.in | 6 +++--- src/lib/gui/MainWindow.cpp | 2 +- src/lib/gui/Messages.cpp | 2 +- src/lib/gui/VersionChecker.cpp | 2 +- src/lib/gui/dialogs/AboutDialog.cpp | 2 +- 11 files changed, 13 insertions(+), 14 deletions(-) rename src/lib/{ => common}/VersionInfo.h.in (59%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 72a86f926..4c6251db1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,8 +3,7 @@ # SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton # SPDX-License-Identifier: MIT -include_directories(./lib) -include_directories(${CMAKE_CURRENT_BINARY_DIR}/lib) +include_directories(./lib "${CMAKE_CURRENT_BINARY_DIR}/lib") add_subdirectory(lib) add_subdirectory(apps) diff --git a/src/apps/deskflow-core/CoreArgParser.cpp b/src/apps/deskflow-core/CoreArgParser.cpp index 84978b168..2959f2deb 100644 --- a/src/apps/deskflow-core/CoreArgParser.cpp +++ b/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); diff --git a/src/apps/deskflow-daemon/deskflow-daemon.cpp b/src/apps/deskflow-daemon/deskflow-daemon.cpp index 7cdbd2578..cce65a0cb 100644 --- a/src/apps/deskflow-daemon/deskflow-daemon.cpp +++ b/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" diff --git a/src/apps/deskflow-gui/deskflow-gui.cpp b/src/apps/deskflow-gui/deskflow-gui.cpp index 918c1efaf..c62a3ebb4 100644 --- a/src/apps/deskflow-gui/deskflow-gui.cpp +++ b/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" diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index b327522b7..e936fa077 100644 --- a/src/lib/CMakeLists.txt +++ b/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) diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt index 4ca144654..034f2cc6c 100644 --- a/src/lib/common/CMakeLists.txt +++ b/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) diff --git a/src/lib/VersionInfo.h.in b/src/lib/common/VersionInfo.h.in similarity index 59% rename from src/lib/VersionInfo.h.in rename to src/lib/common/VersionInfo.h.in index 4ec6d0988..f380ac9fb 100644 --- a/src/lib/VersionInfo.h.in +++ b/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@ ? "@CMAKE_PROJECT_VERSION@ (@GIT_SHA_SHORT@)" : "@CMAKE_PROJECT_VERSION_MAJOR@.@CMAKE_PROJECT_VERSION_MINOR@.@CMAKE_PROJECT_VERSION_PATCH@"; -// clang-format on +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@"; diff --git a/src/lib/gui/MainWindow.cpp b/src/lib/gui/MainWindow.cpp index 8b4bb9f54..0fcd03084 100644 --- a/src/lib/gui/MainWindow.cpp +++ b/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" diff --git a/src/lib/gui/Messages.cpp b/src/lib/gui/Messages.cpp index de6d6f996..fb640e7ce 100644 --- a/src/lib/gui/Messages.cpp +++ b/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 #include diff --git a/src/lib/gui/VersionChecker.cpp b/src/lib/gui/VersionChecker.cpp index 120fd6924..f2fa1dd82 100644 --- a/src/lib/gui/VersionChecker.cpp +++ b/src/lib/gui/VersionChecker.cpp @@ -6,8 +6,8 @@ #include "VersionChecker.h" -#include "VersionInfo.h" #include "common/Settings.h" +#include "common/VersionInfo.h" #include #include diff --git a/src/lib/gui/dialogs/AboutDialog.cpp b/src/lib/gui/dialogs/AboutDialog.cpp index 307ad268e..1b44977b6 100644 --- a/src/lib/gui/dialogs/AboutDialog.cpp +++ b/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