Merge bitcoin/bitcoin#33971: cmake: Set WITH_ZMQ to ON in Windows presets
49c6728535cmake: 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 ACK49c6728535Tree-SHA512: acaef1eba56e75f9979db1809c6ebac59b2ed49002ae557fcb172f6119f6b8927580583616628f24d71ccbb32544f4d96317ff1d3125a9b5446ae89d1d318de0
This commit is contained in:
3 files changed
+7
-5
No files matched your search
@@ -218,10 +218,10 @@ jobs:
|
|||||||
job-type: [standard, fuzz]
|
job-type: [standard, fuzz]
|
||||||
include:
|
include:
|
||||||
- job-type: standard
|
- job-type: standard
|
||||||
generate-options: '-DBUILD_GUI=ON -DWITH_ZMQ=ON -DBUILD_BENCH=ON -DBUILD_KERNEL_LIB=ON -DBUILD_UTIL_CHAINSTATE=ON -DWERROR=ON'
|
generate-options: '-DBUILD_BENCH=ON -DBUILD_KERNEL_LIB=ON -DBUILD_UTIL_CHAINSTATE=ON -DWERROR=ON'
|
||||||
job-name: 'Windows native, VS 2022'
|
job-name: 'Windows native, VS 2022'
|
||||||
- job-type: fuzz
|
- job-type: fuzz
|
||||||
generate-options: '-DVCPKG_MANIFEST_NO_DEFAULT_FEATURES=ON -DVCPKG_MANIFEST_FEATURES="wallet" -DBUILD_GUI=OFF -DBUILD_FOR_FUZZING=ON -DWERROR=ON'
|
generate-options: '-DVCPKG_MANIFEST_NO_DEFAULT_FEATURES=ON -DVCPKG_MANIFEST_FEATURES="wallet" -DBUILD_GUI=OFF -DWITH_ZMQ=OFF -DBUILD_FOR_FUZZING=ON -DWERROR=ON'
|
||||||
job-name: 'Windows native, fuzz, VS 2022'
|
job-name: 'Windows native, fuzz, VS 2022'
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
|||||||
+4
-2
@@ -14,7 +14,8 @@
|
|||||||
"toolchainFile": "$env{VCPKG_ROOT}\\scripts\\buildsystems\\vcpkg.cmake",
|
"toolchainFile": "$env{VCPKG_ROOT}\\scripts\\buildsystems\\vcpkg.cmake",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"VCPKG_TARGET_TRIPLET": "x64-windows",
|
"VCPKG_TARGET_TRIPLET": "x64-windows",
|
||||||
"BUILD_GUI": "ON"
|
"BUILD_GUI": "ON",
|
||||||
|
"WITH_ZMQ": "ON"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -30,7 +31,8 @@
|
|||||||
"toolchainFile": "$env{VCPKG_ROOT}\\scripts\\buildsystems\\vcpkg.cmake",
|
"toolchainFile": "$env{VCPKG_ROOT}\\scripts\\buildsystems\\vcpkg.cmake",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"VCPKG_TARGET_TRIPLET": "x64-windows-static",
|
"VCPKG_TARGET_TRIPLET": "x64-windows-static",
|
||||||
"BUILD_GUI": "ON"
|
"BUILD_GUI": "ON",
|
||||||
|
"WITH_ZMQ": "ON"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ cmake -B build --preset vs2022-static -DVCPKG_INSTALLED_DIR="C:\path_without_spa
|
|||||||
One can skip vcpkg manifest default features to speedup the configuration step.
|
One can skip vcpkg manifest default features to speedup the configuration step.
|
||||||
For example, the following invocation will skip all features except for "wallet" and "tests" and their dependencies:
|
For example, the following invocation will skip all features except for "wallet" and "tests" and their dependencies:
|
||||||
```
|
```
|
||||||
cmake -B build --preset vs2022 -DVCPKG_MANIFEST_NO_DEFAULT_FEATURES=ON -DVCPKG_MANIFEST_FEATURES="wallet;tests" -DBUILD_GUI=OFF
|
cmake -B build --preset vs2022 -DVCPKG_MANIFEST_NO_DEFAULT_FEATURES=ON -DVCPKG_MANIFEST_FEATURES="wallet;tests" -DBUILD_GUI=OFF -DWITH_ZMQ=OFF
|
||||||
```
|
```
|
||||||
|
|
||||||
Available features are listed in the [`vcpkg.json`](/vcpkg.json) file.
|
Available features are listed in the [`vcpkg.json`](/vcpkg.json) file.
|
||||||
|
|||||||
Reference in new issue
Block a user