diff --git a/.gitignore b/.gitignore index 8f9e4d3..d39b3fe 100644 --- 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 a28d269..2c3d92c 100644 --- 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 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 faf9bed..e417cab 100644 --- 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 778f8d1..123b195 100644 --- 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 2c99b31..3d1ad59 100644 --- 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 b3a6ea2..29b5f52 100644 --- 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 e9db83c..51e068b 100644 --- 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 b125592..b468fed 100644 --- 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 c7d4ca0..40fa50c 100644 --- 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 e85e91a..663e664 100644 --- 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)