cmake: remove feather-config.h

diff --git a/.gitignore b/.gitignore
index 8f9e4d3a42d15c82e2809a6e7a81094942d57d10..d39b3fe9e138c38c752fb186dc562d24650d518d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -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/*

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a28d2696cd89dc9ca8b9b3d3025c9155d40467a5..2c3d92c623b91d401a75b945c2ec962825960049 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)

diff --git a/cmake/config-feather.h.cmake b/cmake/config-feather.h.cmake
deleted file mode 100644 (file)
index 1c763b9..0000000
--- a/cmake/config-feather.h.cmake
+++ /dev/null
@@ -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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index faf9beda5a1c3a4229d886794d883bbe25ef8c41..e417caba0f2d7633a968f288d03d3c6563c0faf4 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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}

diff --git a/src/dialog/AboutDialog.cpp b/src/dialog/AboutDialog.cpp
index 778f8d105bdde524e49336786aaf07078911c557..123b195da7bdfd0b9f9ea727194bc23a5eeca564 100644 (file)
--- a/src/dialog/AboutDialog.cpp
+++ b/src/dialog/AboutDialog.cpp
@@ -7,7 +7,6 @@
 #include <QMessageBox>
 #include <QDate>
 
-#include "config-feather.h"
 #include "utils/Utils.h"
 
 AboutDialog::AboutDialog(QWidget *parent)

diff --git a/src/dialog/DebugInfoDialog.cpp b/src/dialog/DebugInfoDialog.cpp
index 2c99b317f31cf062a87c4b520e9c6f56474fd474..3d1ad59f66632c8a38b8105b6ce81bb5ea8bacfa 100644 (file)
--- a/src/dialog/DebugInfoDialog.cpp
+++ b/src/dialog/DebugInfoDialog.cpp
@@ -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"

diff --git a/src/main.cpp b/src/main.cpp
index b3a6ea2346ed852d4e219adcbf4c724b408e2053..29b5f52efd1d598100dc23cb86fe1be13745c78a 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4,7 +4,6 @@
 #include <QSslSocket>
 
 #include "Application.h"
-#include "config-feather.h"
 #include "constants.h"
 #include "utils/EventFilter.h"
 #include "WindowManager.h"

diff --git a/src/utils/TorManager.cpp b/src/utils/TorManager.cpp
index e9db83cc854b53a4c6be9e83e6cc9fea3f4de443..51e068b65b6c921c06f1d42d4d2f0b7b0ea8b845 100644 (file)
--- a/src/utils/TorManager.cpp
+++ b/src/utils/TorManager.cpp
@@ -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)

diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp
index b12559233195d610413ea9c3e25e9bfa66c075ac..b468fed39f8b01aa119921fffdaf0e42019f8031 100644 (file)
--- a/src/utils/Utils.cpp
+++ b/src/utils/Utils.cpp
@@ -18,7 +18,6 @@
 #include <QStandardPaths>
 #include <QProcess>
 
-#include "config-feather.h"
 #include "constants.h"
 #include "networktype.h"
 #include "utils/AppData.h"

diff --git a/src/utils/updater/Updater.cpp b/src/utils/updater/Updater.cpp
index c7d4ca052368db30580e089ad7ba01af0cacd4d0..40fa50c405db109c6011ba9ffa111cf4bb5e29cd 100644 (file)
--- a/src/utils/updater/Updater.cpp
+++ b/src/utils/updater/Updater.cpp
@@ -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"

diff --git a/src/wizard/PageMenu.cpp b/src/wizard/PageMenu.cpp
index e85e91ac5916aab2fe675d40b8c323ec2a03197d..663e66431ff5232b0118dcbfabd5ad40ce67f6b6 100644 (file)
--- a/src/wizard/PageMenu.cpp
+++ b/src/wizard/PageMenu.cpp
@@ -6,7 +6,6 @@
 
 #include <QTimer>
 
-#include "config-feather.h"
 #include "WalletWizard.h"
 
 PageMenu::PageMenu(WizardFields *fields, WalletKeysFilesModel *wallets, QWidget *parent)