Skip to content

Commit 3f226fa

Browse files
committed
Regenerated with vNext build/install scripts.
1 parent 4f211ad commit 3f226fa

11 files changed

Lines changed: 3394 additions & 3422 deletions

File tree

.github/workflows/ci.yml

Lines changed: 213 additions & 615 deletions
Large diffs are not rendered by default.

build.cmd

Lines changed: 0 additions & 113 deletions
This file was deleted.

builds/cmake/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ option( enable-avx2 "Use Intel AVX2 intrinsics." OFF )
2626
option( enable-avx512 "Use Intel AVX512 intrinsics." OFF )
2727
option( enable-sse41 "Use SSE4.1 hardware instructions." OFF )
2828
option( enable-shani "Use Intel SHA Extensions." OFF )
29-
option( with-test "Build test." ON )
29+
option( with-tests "Build tests." ON )
3030
option( with-examples "Build examples." ON )
3131

3232
#------------------------------------------------------------------------------
@@ -278,7 +278,7 @@ set_target_properties( libbitcoin-system
278278
#------------------------------------------------------------------------------
279279
# libbitcoin-system-test tests
280280
#------------------------------------------------------------------------------
281-
if ( with-test )
281+
if ( with-tests )
282282
add_executable( libbitcoin-system-test )
283283

284284
enable_testing()

builds/cmake/CMakePresets.json

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,19 @@
1111
"type": "inList",
1212
"string": "${hostSystemName}",
1313
"list": [
14-
"Darwin",
15-
"Linux"
14+
"Darwin",
15+
"Linux"
1616
]
1717
},
1818
"cacheVariables": {
1919
"CMAKE_PREFIX_PATH": {
2020
"type": "PATH",
2121
"value": "${sourceParentDir}/../../../prefix/${presetName}"
2222
},
23+
"CMAKE_INSTALL_PREFIX_PATH": {
24+
"type": "PATH",
25+
"value": "${sourceParentDir}/../../../prefix/${presetName}"
26+
},
2327
"CMAKE_LIBRARY_PATH": {
2428
"type": "PATH",
2529
"value": "${sourceParentDir}/../../../prefix/${presetName}/lib:$env{CMAKE_LIBRARY_PATH}"
@@ -31,25 +35,19 @@
3135
"description": "Factored debug settings.",
3236
"hidden": true,
3337
"cacheVariables": {
38+
"CMAKE_BUILD_TYPE": "Debug",
3439
"CMAKE_C_FLAGS": "$env{CMAKE_C_FLAGS} -Og -g --coverage",
35-
"CMAKE_CXX_FLAGS": "$env{CMAKE_CXX_FLAGS} -Og -g --coverage",
36-
"enable-ndebug": {
37-
"type": "BOOL",
38-
"value": "OFF"
39-
}
40+
"CMAKE_CXX_FLAGS": "$env{CMAKE_CXX_FLAGS} -Og -g --coverage"
4041
}
4142
},
4243
{
4344
"name": "gnu-release",
4445
"description": "Factored release settings.",
4546
"hidden": true,
4647
"cacheVariables": {
48+
"CMAKE_BUILD_TYPE": "Release",
4749
"CMAKE_C_FLAGS": "$env{CMAKE_C_FLAGS} -O3",
48-
"CMAKE_CXX_FLAGS": "$env{CMAKE_CXX_FLAGS} -O3",
49-
"enable-ndebug": {
50-
"type": "BOOL",
51-
"value": "ON"
52-
}
50+
"CMAKE_CXX_FLAGS": "$env{CMAKE_CXX_FLAGS} -O3"
5351
}
5452
},
5553
{
@@ -124,9 +122,9 @@
124122
"name": "nix-target-list",
125123
"hidden": true,
126124
"targets": [
127-
"bitcoin-system",
128-
"libbitcoin-system-examples",
129-
"libbitcoin-system-test"
125+
"libbitcoin-system",
126+
"libbitcoin-system-test",
127+
"examples"
130128
]
131129
},
132130
{

0 commit comments

Comments
 (0)