File tree Expand file tree Collapse file tree 2 files changed +2
-13
lines changed Expand file tree Collapse file tree 2 files changed +2
-13
lines changed Original file line number Diff line number Diff line change 68
68
- uses : msys2/setup-msys2@v2
69
69
with :
70
70
update : true
71
- install : mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-ccache mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-libusb mingw-w64-x86_64-unbound git
72
- - shell : msys2 {0}
73
- run : |
74
- curl -O https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-protobuf-c-1.4.1-1-any.pkg.tar.zst
75
- curl -O https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-protobuf-21.9-1-any.pkg.tar.zst
76
- pacman --noconfirm -U mingw-w64-x86_64-protobuf-c-1.4.1-1-any.pkg.tar.zst mingw-w64-x86_64-protobuf-21.9-1-any.pkg.tar.zst
71
+ install : mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-ccache mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb mingw-w64-x86_64-unbound git pkg-config
77
72
- name : build
78
73
run : |
79
74
${{env.CCACHE_SETTINGS}}
Original file line number Diff line number Diff line change @@ -72,16 +72,10 @@ endmacro()
72
72
73
73
# Use Trezor master switch
74
74
if (USE_DEVICE_TREZOR)
75
- # Protobuf is required to build protobuf messages for Trezor
76
- include (FindProtobuf OPTIONAL )
77
-
78
75
# PkgConfig works better with new Protobuf
79
76
find_package (PkgConfig QUIET )
80
- pkg_check_modules(PROTOBUF protobuf )
77
+ FIND_PACKAGE (Protobuf CONFIG )
81
78
82
- if (NOT Protobuf_FOUND)
83
- FIND_PACKAGE (Protobuf CONFIG)
84
- endif ()
85
79
if (NOT Protobuf_FOUND)
86
80
FIND_PACKAGE (Protobuf)
87
81
endif ()
You can’t perform that action at this time.
0 commit comments