[FIXUP] cmake: Revert CMake's way to handle USE_DBUS definition

hebasto · Jul 19, 2024 · f476787 · f476787
1 parent 456f5af
commit f476787
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -166,6 +166,7 @@ if(BUILD_GUI)
   endif()
   if(WITH_DBUS)
     list(APPEND qt_components DBus)
+    set(USE_DBUS TRUE)
   endif()
   if(BUILD_GUI_TESTS)
     list(APPEND qt_components Test)

diff --git a/cmake/bitcoin-config.h.in b/cmake/bitcoin-config.h.in
@@ -128,6 +128,9 @@
 /* Define if Berkeley DB (BDB) support should be compiled in. */
 #cmakedefine USE_BDB
 
+/* Define if dbus support should be compiled in */
+#cmakedefine USE_DBUS 1
+
 /* Define this symbol to build code that uses ARMv8 SHA-NI intrinsics */
 #cmakedefine ENABLE_ARM_SHANI 1
 

diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt
@@ -212,7 +212,6 @@ if(ENABLE_WALLET)
 endif()
 
 if(WITH_DBUS)
-  target_compile_definitions(bitcoinqt PRIVATE USE_DBUS)
   target_link_libraries(bitcoinqt PRIVATE Qt5::DBus)
 endif()
 

diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp
@@ -2,6 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <config/bitcoin-config.h> // IWYU pragma: keep
+
 #include <qt/notificator.h>
 
 #include <QApplication>

diff --git a/src/qt/notificator.h b/src/qt/notificator.h
@@ -5,6 +5,8 @@
 #ifndef BITCOIN_QT_NOTIFICATOR_H
 #define BITCOIN_QT_NOTIFICATOR_H
 
+#include <config/bitcoin-config.h> // IWYU pragma: keep
+
 #include <QIcon>
 #include <QObject>