Skip to content

Commit 69f0d4a

Browse files
committed
scripted-diff: s/WITH_MULTIPROCESS/ENABLE_IPC/ in cmake
Rename WITH_MULTIPROCESS to ENABLE_IPC, because ENABLE_IPC is a more accurate name for the feature. It controls whether the src/ipc/ directory is built and whether IPC features like -ipcbind, -ipcconnect, and -ipcfd are available. It does NOT currently enable multiprocess features which are implemented in #10102 building on top of the IPC features. It will also no longer (as of the next commit), control whether a find_package call is made so the "WITH_" prefix is also inappropriate. -BEGIN VERIFY SCRIPT- git grep -l WITH_MULTIPROCESS | xargs sed -i s/WITH_MULTIPROCESS/ENABLE_IPC/g -END VERIFY SCRIPT-
1 parent 3f6fb40 commit 69f0d4a

File tree

9 files changed

+17
-17
lines changed

9 files changed

+17
-17
lines changed

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ endif()
153153

154154
cmake_dependent_option(WITH_DBUS "Enable DBus support." ON "CMAKE_SYSTEM_NAME STREQUAL \"Linux\" AND BUILD_GUI" OFF)
155155

156-
option(WITH_MULTIPROCESS "Build multiprocess bitcoin-node and bitcoin-gui executables in addition to monolithic bitcoind and bitcoin-qt executables. Requires libmultiprocess library. Experimental." OFF)
157-
if(WITH_MULTIPROCESS)
156+
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)
157+
if(ENABLE_IPC)
158158
find_package(Libmultiprocess REQUIRED COMPONENTS Lib)
159159
find_package(LibmultiprocessNative REQUIRED COMPONENTS Bin
160160
NAMES Libmultiprocess
@@ -648,14 +648,14 @@ message("Configure summary")
648648
message("=================")
649649
message("Executables:")
650650
message(" bitcoind ............................ ${BUILD_DAEMON}")
651-
if(BUILD_DAEMON AND WITH_MULTIPROCESS)
651+
if(BUILD_DAEMON AND ENABLE_IPC)
652652
set(bitcoin_daemon_status ON)
653653
else()
654654
set(bitcoin_daemon_status OFF)
655655
endif()
656656
message(" bitcoin-node (multiprocess) ......... ${bitcoin_daemon_status}")
657657
message(" bitcoin-qt (GUI) .................... ${BUILD_GUI}")
658-
if(BUILD_GUI AND WITH_MULTIPROCESS)
658+
if(BUILD_GUI AND ENABLE_IPC)
659659
set(bitcoin_gui_status ON)
660660
else()
661661
set(bitcoin_gui_status OFF)

CMakePresets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"ENABLE_WALLET": "ON",
8282
"WARN_INCOMPATIBLE_BDB": "OFF",
8383
"WITH_BDB": "ON",
84-
"WITH_MULTIPROCESS": "ON",
84+
"ENABLE_IPC": "ON",
8585
"WITH_QRENCODE": "ON",
8686
"WITH_USDT": "ON",
8787
"WITH_ZMQ": "ON"

depends/toolchain.cmake.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@ else()
159159
endif()
160160

161161
if("@multiprocess@" STREQUAL "1")
162-
set(WITH_MULTIPROCESS ON CACHE BOOL "")
162+
set(ENABLE_IPC ON CACHE BOOL "")
163163
set(Libmultiprocess_ROOT "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "")
164164
set(LibmultiprocessNative_ROOT "${CMAKE_CURRENT_LIST_DIR}/native" CACHE PATH "")
165165
else()
166-
set(WITH_MULTIPROCESS OFF CACHE BOOL "")
166+
set(ENABLE_IPC OFF CACHE BOOL "")
167167
endif()

doc/design/libraries.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
| *libbitcoin_crypto* | Hardware-optimized functions for data encryption, hashing, message authentication, and key derivation. |
99
| *libbitcoin_kernel* | Consensus engine and support library used for validation by *libbitcoin_node*. |
1010
| *libbitcoinqt* | GUI functionality used by *bitcoin-qt* and *bitcoin-gui* executables. |
11-
| *libbitcoin_ipc* | IPC functionality used by *bitcoin-node*, *bitcoin-wallet*, *bitcoin-gui* executables to communicate when [`-DWITH_MULTIPROCESS=ON`](multiprocess.md) is used. |
11+
| *libbitcoin_ipc* | IPC functionality used by *bitcoin-node*, *bitcoin-wallet*, *bitcoin-gui* executables to communicate when [`-DENABLE_IPC=ON`](multiprocess.md) is used. |
1212
| *libbitcoin_node* | P2P and RPC server functionality used by *bitcoind* and *bitcoin-qt* executables. |
1313
| *libbitcoin_util* | Home for common functionality shared by different executables and libraries. Similar to *libbitcoin_common*, but lower-level (see [Dependencies](#dependencies)). |
1414
| *libbitcoin_wallet* | Wallet functionality used by *bitcoind* and *bitcoin-wallet* executables. |

doc/multiprocess.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _This document describes usage of the multiprocess feature. For design informati
44

55
## Build Option
66

7-
On Unix systems, the `-DWITH_MULTIPROCESS=ON` build option can be passed to build the supplemental `bitcoin-node` and `bitcoin-gui` multiprocess executables.
7+
On Unix systems, the `-DENABLE_IPC=ON` build option can be passed to build the supplemental `bitcoin-node` and `bitcoin-gui` multiprocess executables.
88

99
## Debugging
1010

@@ -25,9 +25,9 @@ build/bin/bitcoin-node -regtest -printtoconsole -debug=ipc
2525
BITCOIND=$(pwd)/build/bin/bitcoin-node build/test/functional/test_runner.py
2626
```
2727

28-
The `cmake` build will pick up settings and library locations from the depends directory, so there is no need to pass `-DWITH_MULTIPROCESS=ON` as a separate flag when using the depends system (it's controlled by the `MULTIPROCESS=1` option).
28+
The `cmake` build will pick up settings and library locations from the depends directory, so there is no need to pass `-DENABLE_IPC=ON` as a separate flag when using the depends system (it's controlled by the `MULTIPROCESS=1` option).
2929

30-
Alternately, you can install [Cap'n Proto](https://capnproto.org/) and [libmultiprocess](https://github.com/bitcoin-core/libmultiprocess) packages on your system, and just run `cmake -B build -DWITH_MULTIPROCESS=ON` without using the depends system. The `cmake` build will be able to locate the installed packages via [pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/). See [Installation](https://github.com/bitcoin-core/libmultiprocess/blob/master/doc/install.md) section of the libmultiprocess readme for install steps. See [build-unix.md](build-unix.md) and [build-osx.md](build-osx.md) for information about installing dependencies in general.
30+
Alternately, you can install [Cap'n Proto](https://capnproto.org/) and [libmultiprocess](https://github.com/bitcoin-core/libmultiprocess) packages on your system, and just run `cmake -B build -DENABLE_IPC=ON` without using the depends system. The `cmake` build will be able to locate the installed packages via [pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/). See [Installation](https://github.com/bitcoin-core/libmultiprocess/blob/master/doc/install.md) section of the libmultiprocess readme for install steps. See [build-unix.md](build-unix.md) and [build-osx.md](build-osx.md) for information about installing dependencies in general.
3131

3232
## Usage
3333

doc/translation_process.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ We use automated scripts to help extract translations in both Qt, and non-Qt sou
1818

1919
To automatically regenerate the `bitcoin_en.ts` file, run the following commands:
2020
```sh
21-
cmake --preset dev-mode -DWITH_USDT=OFF -DWITH_MULTIPROCESS=OFF
21+
cmake --preset dev-mode -DWITH_USDT=OFF -DENABLE_IPC=OFF
2222
cmake --build build_dev_mode --target translate
2323
```
2424

src/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ add_dependencies(bitcoin_clientversion generate_build_info)
9696

9797
add_subdirectory(crypto)
9898
add_subdirectory(util)
99-
if(WITH_MULTIPROCESS)
99+
if(ENABLE_IPC)
100100
add_subdirectory(ipc)
101101
endif()
102102

@@ -342,7 +342,7 @@ if(BUILD_DAEMON)
342342
)
343343
install_binary_component(bitcoind HAS_MANPAGE)
344344
endif()
345-
if(WITH_MULTIPROCESS AND BUILD_DAEMON)
345+
if(ENABLE_IPC AND BUILD_DAEMON)
346346
add_executable(bitcoin-node
347347
bitcoind.cpp
348348
init/bitcoin-node.cpp
@@ -356,7 +356,7 @@ if(WITH_MULTIPROCESS AND BUILD_DAEMON)
356356
install_binary_component(bitcoin-node)
357357
endif()
358358

359-
if(WITH_MULTIPROCESS AND BUILD_TESTS)
359+
if(ENABLE_IPC AND BUILD_TESTS)
360360
# bitcoin_ipc_test library target is defined here in src/CMakeLists.txt
361361
# instead of src/test/CMakeLists.txt so capnp files in src/test/ are able to
362362
# reference capnp files in src/ipc/capnp/ by relative path. The Cap'n Proto

src/qt/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ if(WIN32)
269269
set_target_properties(bitcoin-qt PROPERTIES WIN32_EXECUTABLE TRUE)
270270
endif()
271271

272-
if(WITH_MULTIPROCESS)
272+
if(ENABLE_IPC)
273273
add_executable(bitcoin-gui
274274
main.cpp
275275
../init/bitcoin-gui.cpp

src/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ if(ENABLE_WALLET)
157157
add_subdirectory(${PROJECT_SOURCE_DIR}/src/wallet/test wallet)
158158
endif()
159159

160-
if(WITH_MULTIPROCESS)
160+
if(ENABLE_IPC)
161161
target_link_libraries(bitcoin_ipc_test
162162
PRIVATE
163163
core_interface

0 commit comments

Comments
 (0)