Skip to content

Commit 81b9462

Browse files
committed
Merge bitcoin-core/gui-qml#480: cmake: Add missed Boost::headers
71a9844cf9c4e5316ab3ab21f72e32d3f907d00d ci: Drop no longer necessary workaround (Hennadii Stepanov) e76a0850fd1d09bdfe484a5374cab925451fbea3 cmake: Add missed `Boost::headers` (Hennadii Stepanov) Pull request description: This PR fixes building on macOS with Boost installed via Homebrew. Top commit has no ACKs. Tree-SHA512: b90fbcf3a3a78f5305ca83e3811ddbb39cab089823ac3c75769d55be1955cd2672da7785f9160a66e13c51c1f6c8fda3d0a78620a730e1754ce94ac075112cdf
2 parents c3eb564 + d2edf2a commit 81b9462

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

.github/workflows/artifacts.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ jobs:
5252
- name: Build
5353
run: |
5454
git submodule update --init
55-
if [[ "${{ matrix.os }}" == macos* ]]; then
56-
export CPLUS_INCLUDE_PATH="$(brew --prefix boost)/include"
57-
export LIBRARY_PATH="$(brew --prefix boost)/lib"
58-
fi
5955
cmake -B build
6056
cmake --build build -j$(nproc)
6157

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ target_link_libraries(bitcoinqml
9999
core_interface
100100
bitcoin_node
101101
univalue
102+
Boost::headers
102103
Qt6::Qml
103104
Qt6::Quick
104105
Qt6::QuickControls2

0 commit comments

Comments
 (0)