Skip to content

Commit 7d7cb1b

Browse files
committed
Merge bitcoin/bitcoin#33971: cmake: Set WITH_ZMQ to ON in Windows presets
49c6728 cmake: Set `WITH_ZMQ` to `ON` in Windows presets (Hennadii Stepanov) Pull request description: The "zeromq" feature is already enabled by default in `vcpkg.json`, and there appears to be no reason to omit this configuration option when building on Windows. ACKs for top commit: maflcko: lgtm ACK 49c6728 Tree-SHA512: acaef1eba56e75f9979db1809c6ebac59b2ed49002ae557fcb172f6119f6b8927580583616628f24d71ccbb32544f4d96317ff1d3125a9b5446ae89d1d318de0
2 parents f6acbef + 49c6728 commit 7d7cb1b

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,10 @@ jobs:
218218
job-type: [standard, fuzz]
219219
include:
220220
- job-type: standard
221-
generate-options: '-DBUILD_GUI=ON -DWITH_ZMQ=ON -DBUILD_BENCH=ON -DBUILD_KERNEL_LIB=ON -DBUILD_UTIL_CHAINSTATE=ON -DWERROR=ON'
221+
generate-options: '-DBUILD_BENCH=ON -DBUILD_KERNEL_LIB=ON -DBUILD_UTIL_CHAINSTATE=ON -DWERROR=ON'
222222
job-name: 'Windows native, VS 2022'
223223
- job-type: fuzz
224-
generate-options: '-DVCPKG_MANIFEST_NO_DEFAULT_FEATURES=ON -DVCPKG_MANIFEST_FEATURES="wallet" -DBUILD_GUI=OFF -DBUILD_FOR_FUZZING=ON -DWERROR=ON'
224+
generate-options: '-DVCPKG_MANIFEST_NO_DEFAULT_FEATURES=ON -DVCPKG_MANIFEST_FEATURES="wallet" -DBUILD_GUI=OFF -DWITH_ZMQ=OFF -DBUILD_FOR_FUZZING=ON -DWERROR=ON'
225225
job-name: 'Windows native, fuzz, VS 2022'
226226

227227
steps:

CMakePresets.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"toolchainFile": "$env{VCPKG_ROOT}\\scripts\\buildsystems\\vcpkg.cmake",
1515
"cacheVariables": {
1616
"VCPKG_TARGET_TRIPLET": "x64-windows",
17-
"BUILD_GUI": "ON"
17+
"BUILD_GUI": "ON",
18+
"WITH_ZMQ": "ON"
1819
}
1920
},
2021
{
@@ -30,7 +31,8 @@
3031
"toolchainFile": "$env{VCPKG_ROOT}\\scripts\\buildsystems\\vcpkg.cmake",
3132
"cacheVariables": {
3233
"VCPKG_TARGET_TRIPLET": "x64-windows-static",
33-
"BUILD_GUI": "ON"
34+
"BUILD_GUI": "ON",
35+
"WITH_ZMQ": "ON"
3436
}
3537
},
3638
{

doc/build-windows-msvc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ cmake -B build --preset vs2022-static -DVCPKG_INSTALLED_DIR="C:\path_without_spa
9797
One can skip vcpkg manifest default features to speedup the configuration step.
9898
For example, the following invocation will skip all features except for "wallet" and "tests" and their dependencies:
9999
```
100-
cmake -B build --preset vs2022 -DVCPKG_MANIFEST_NO_DEFAULT_FEATURES=ON -DVCPKG_MANIFEST_FEATURES="wallet;tests" -DBUILD_GUI=OFF
100+
cmake -B build --preset vs2022 -DVCPKG_MANIFEST_NO_DEFAULT_FEATURES=ON -DVCPKG_MANIFEST_FEATURES="wallet;tests" -DBUILD_GUI=OFF -DWITH_ZMQ=OFF
101101
```
102102

103103
Available features are listed in the [`vcpkg.json`](/vcpkg.json) file.

0 commit comments

Comments
 (0)