Skip to content

Commit 3edf400

Browse files
committed
Merge bitcoin/bitcoin#32469: cmake: Allow WITH_DBUS on all Unix-like systems
5b7ed46 cmake: Allow `WITH_DBUS` on all Unix-like systems (Hennadii Stepanov) Pull request description: This PR makes the `WITH_DBUS` option available on all Unix-like systems, not just Linux, thereby fixing a regression that was overlooked during the migration from Autotools. Note: Enabling D-Bus support on macOS still makes no sense, since the `Notificator` class uses the User Notification Center regardless:https://github.com/bitcoin/bitcoin/blob/746ab19d5a13c98ae7492f9b6fb7bd6a2103c65d/src/qt/notificator.cpp#L43-L56 Fixes bitcoin/bitcoin#32464. ACKs for top commit: laanwj: ACK 5b7ed46 theStack: tACK 5b7ed46 Tree-SHA512: 01f5a365a8109c273489e2d46b08d8b64b82251c4814a486561221b55d8a47cb1effc9140dbd6b2ab5f12e2966d0ea0d07a4cbf67d310001ee681b0f5b63f300
2 parents 59e09e0 + 5b7ed46 commit 3edf400

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ if(WITH_QRENCODE)
138138
set(USE_QRCODE TRUE)
139139
endif()
140140

141-
cmake_dependent_option(WITH_DBUS "Enable DBus support." ON "CMAKE_SYSTEM_NAME STREQUAL \"Linux\" AND BUILD_GUI" OFF)
141+
cmake_dependent_option(WITH_DBUS "Enable DBus support." ON "NOT CMAKE_SYSTEM_NAME MATCHES \"(Windows|Darwin)\" AND BUILD_GUI" OFF)
142142

143143
option(ENABLE_IPC "Build multiprocess bitcoin-node and bitcoin-gui executables in addition to monolithic bitcoind and bitcoin-qt executables. Requires libmultiprocess library. Experimental." OFF)
144144
cmake_dependent_option(WITH_EXTERNAL_LIBMULTIPROCESS "Build with external libmultiprocess library instead of with local git subtree when ENABLE_IPC is enabled. This is not normally recommended, but can be useful for developing libmultiprocess itself." OFF "ENABLE_IPC" OFF)
@@ -679,7 +679,7 @@ endif()
679679
message(" IPC ................................. ${ipc_status}")
680680
message(" USDT tracing ........................ ${WITH_USDT}")
681681
message(" QR code (GUI) ....................... ${WITH_QRENCODE}")
682-
message(" DBus (GUI, Linux only) .............. ${WITH_DBUS}")
682+
message(" DBus (GUI) .......................... ${WITH_DBUS}")
683683
message("Tests:")
684684
message(" test_bitcoin ........................ ${BUILD_TESTS}")
685685
message(" test_bitcoin-qt ..................... ${BUILD_GUI_TESTS}")

0 commit comments

Comments
 (0)