fix: split version info in new header

a new file src/lib/VersionInfo.h.in now holds our version info vars
fixes #8657
This commit is contained in:
sithlord48 2025-07-18 21:30:31 -04:00 committed by Nick Bolton
parent f33848f9b8
commit a4c82869a6
10 changed files with 23 additions and 6 deletions

View file

@ -5,6 +5,7 @@
* 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"

View file

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

View file

@ -3,6 +3,8 @@
# 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)

14
src/lib/VersionInfo.h.in Normal file
View file

@ -0,0 +1,14 @@
/*
* Deskflow -- mouse and keyboard sharing utility
* SPDX-FileCopyrightText: (C) 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
* SPDX-FileCopyrightText: (C) 2025 Symless Ltd.
* SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
*/
#pragma once
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

View file

@ -10,17 +10,11 @@
const auto kAppName = "@CMAKE_PROJECT_PROPER_NAME@";
const auto kAppId = "@CMAKE_PROJECT_NAME@";
const auto kAppDescription = "@CMAKE_PROJECT_DESCRIPTION@";
const auto kVersion = "@CMAKE_PROJECT_VERSION@";
const auto kVersionGitSha = "@GIT_SHA_SHORT@";
const auto kDaemonBinName = "@CMAKE_PROJECT_NAME@-daemon";
const auto kDaemonIpcName = "@CMAKE_PROJECT_NAME@-daemon";
const auto kDaemonLogFilename = "@CMAKE_PROJECT_NAME@-daemon.log";
const auto kDefaultLogFile = "@CMAKE_PROJECT_NAME@.log";
// 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 kCopyright = //
"Copyright @CMAKE_PROJECT_COPYRIGHT@\n"
"Copyright (C) 2012-2025 Symless Ltd.\n"

View file

@ -8,6 +8,7 @@
#include "deskflow/App.h"
#include "DisplayInvalidException.h"
#include "VersionInfo.h"
#include "arch/Arch.h"
#include "base/Log.h"
#include "base/LogOutputters.h"

View file

@ -11,6 +11,7 @@
#include "Diagnostic.h"
#include "StyleUtils.h"
#include "VersionInfo.h"
#include "dialogs/AboutDialog.h"
#include "dialogs/FingerprintDialog.h"

View file

@ -8,6 +8,7 @@
#include "Logger.h"
#include "Styles.h"
#include "VersionInfo.h"
#include "common/Settings.h"
#include "common/UrlConstants.h"

View file

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

View file

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