Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2025-04-04 04:29:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions2

cmake: remove feather-config.h

Browse source
This commit is contained in:
tobtoht 2025-03-27 11:28:33 +01:00
parent 2f0bccf124
commit 82212f4982
No known key found for this signature in database
GPG key ID: E45B10DD027D2472
11 changed files with 4 additions and 20 deletions

1
.gitignore vendored
View file

@ -12,7 +12,6 @@ CMakeFiles
cmake_install.cmake
feather_autogen/
feather.cbp
src/config-feather.h
src/assets_tor.qrc
src/assets_docs.qrc
feather.AppDir/*

2
CMakeLists.txt
View file

@ -67,7 +67,6 @@ if(STATIC)
endif()
include(CMakePackageConfigHelpers)
configure_file("cmake/config-feather.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/src/config-feather.h")
#### Dependencies ####
# Monero
@ -149,7 +148,6 @@ if(TOR_DIR)
endif()
message(STATUS "Embedded Tor version: ${TOR_VERSION}")
configure_file("cmake/config-feather.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/src/config-feather.h")
# Always copy Tor when doing a reproducible build to prevent old versions from getting included
if (REPRODUCIBLE)

10
cmake/config-feather.h.cmake
View file

@ -1,10 +0,0 @@
#ifndef FEATHER_VERSION_H
#define FEATHER_VERSION_H
#define FEATHER_VERSION "@PROJECT_VERSION@"
#define TOR_VERSION "@TOR_VERSION@"
#define FEATHER_TARGET_TRIPLET "@FEATHER_TARGET_TRIPLET@"
#endif //FEATHER_VERSION_H

4
src/CMakeLists.txt
View file

@ -182,6 +182,10 @@ target_include_directories(feather PUBLIC
${BCUR_INCLUDE_DIR}
)
target_compile_definitions(feather PRIVATE FEATHER_VERSION="${PROJECT_VERSION}")
target_compile_definitions(feather PRIVATE FEATHER_TARGET_TRIPLET="${FEATHER_TARGET_TRIPLET}")
target_compile_definitions(feather PRIVATE TOR_VERSION="${TOR_VERSION}")
if(WITH_SCANNER)
target_include_directories(feather PUBLIC
${QtMultimedia_INCLUDE_DIRS}

1
src/dialog/AboutDialog.cpp
View file

@ -7,7 +7,6 @@
#include <QMessageBox>
#include <QDate>
#include "config-feather.h"
#include "utils/Utils.h"
AboutDialog::AboutDialog(QWidget *parent)

1
src/dialog/DebugInfoDialog.cpp
View file

@ -4,7 +4,6 @@
#include "DebugInfoDialog.h"
#include "ui_DebugInfoDialog.h"
#include "config-feather.h"
#include "utils/AppData.h"
#include "utils/os/tails.h"
#include "utils/os/whonix.h"

1
src/main.cpp
View file

@ -4,7 +4,6 @@
#include <QSslSocket>
#include "Application.h"
#include "config-feather.h"
#include "constants.h"
#include "utils/EventFilter.h"
#include "WindowManager.h"

1
src/utils/TorManager.cpp
View file

@ -10,7 +10,6 @@
#include "utils/Utils.h"
#include "utils/os/tails.h"
#include "utils/os/whonix.h"
#include "config-feather.h"
TorManager::TorManager(QObject *parent)
: QObject(parent)

1
src/utils/Utils.cpp
View file

@ -18,7 +18,6 @@
#include <QStandardPaths>
#include <QProcess>
#include "config-feather.h"
#include "constants.h"
#include "networktype.h"
#include "utils/AppData.h"

1
src/utils/updater/Updater.cpp
View file

@ -8,7 +8,6 @@
#include <openpgp/hash.h>
#include "utils/config.h"
#include "config-feather.h"
#include "Utils.h"
#include "utils/AsyncTask.h"
#include "utils/Networking.h"

1
src/wizard/PageMenu.cpp
View file

@ -6,7 +6,6 @@
#include <QTimer>
#include "config-feather.h"
#include "WalletWizard.h"
PageMenu::PageMenu(WizardFields *fields, WalletKeysFilesModel *wallets, QWidget *parent)