gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-12-12 15:50:28 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9840

Browse Source 
8024d43e6 trezor: fix cmake variables (ComputeryPony)
This commit is contained in:
tobtoht
2025-03-24 03:27:14 +00:00
parent 642db87007 8024d43e6f
commit 84685492e6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/CheckTrezor.cmake
View File

@@ -130,13 +130,13 @@ if(Protobuf_FOUND AND USE_DEVICE_TREZOR)
list(APPEND _proto_files "messages-debug.proto") list(APPEND _proto_files "messages-debug.proto")
endif () endif ()
set(_proto_include_dir "${CMAKE_SOURCE_DIR}/src/device_trezor/trezor/protob") set(_proto_include_dir "${CMAKE_CURRENT_LIST_DIR}/../src/device_trezor/trezor/protob")
set(_proto_files_absolute) set(_proto_files_absolute)
foreach(file IN LISTS _proto_files) foreach(file IN LISTS _proto_files)
list(APPEND _proto_files_absolute "${_proto_include_dir}/${file}") list(APPEND _proto_files_absolute "${_proto_include_dir}/${file}")
endforeach () endforeach ()
set(_proto_out_dir "${CMAKE_SOURCE_DIR}/src/device_trezor/trezor/messages") set(_proto_out_dir "${CMAKE_CURRENT_LIST_DIR}/../src/device_trezor/trezor/messages")
execute_process(COMMAND ${Protobuf_PROTOC_EXECUTABLE} --cpp_out "${_proto_out_dir}" "-I${_proto_include_dir}" ${_proto_files_absolute} RESULT_VARIABLE RET OUTPUT_VARIABLE OUT ERROR_VARIABLE ERR) execute_process(COMMAND ${Protobuf_PROTOC_EXECUTABLE} --cpp_out "${_proto_out_dir}" "-I${_proto_include_dir}" ${_proto_files_absolute} RESULT_VARIABLE RET OUTPUT_VARIABLE OUT ERROR_VARIABLE ERR)
if(RET) if(RET)
trezor_fatal_msg("Trezor: protobuf messages could not be (re)generated (err=${RET}). OUT: ${OUT}, ERR: ${ERR}.") trezor_fatal_msg("Trezor: protobuf messages could not be (re)generated (err=${RET}). OUT: ${OUT}, ERR: ${ERR}.")