Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-19 03:08:03 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4945

Browse source 
e37154a build: protobuf dependency fixes, libusb build (ph4r05)
This commit is contained in:
luigi1111 2018-12-31 15:53:59 -06:00
commit 9c2d671397
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
12 changed files with 228 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/device_trezor/CMakeLists.txt
View file

@ -67,14 +67,6 @@ set(trezor_private_headers)
if(DEVICE_TREZOR_READY)
message(STATUS "Trezor support enabled")
add_definitions(-DPROTOBUF_INLINE_NOT_IN_HEADERS=0)
set(TREZOR_LIBUSB_LIBRARIES "")
if(LibUSB_COMPILE_TEST_PASSED)
list(APPEND TREZOR_LIBUSB_LIBRARIES ${LibUSB_LIBRARIES})
message(STATUS "Trezor compatible LibUSB found at: ${LibUSB_INCLUDE_DIRS}")
endif()
monero_private_headers(device_trezor
${device_private_headers})

6
src/wallet/CMakeLists.txt
View file

@ -139,6 +139,12 @@ if (BUILD_GUI_DEPS)
endif()
install(TARGETS wallet_merged
ARCHIVE DESTINATION ${lib_folder})
install(FILES ${TREZOR_DEP_LIBS}
DESTINATION ${lib_folder})
file(WRITE "trezor_link_flags.txt" ${TREZOR_DEP_LINKER})
install(FILES "trezor_link_flags.txt"
DESTINATION ${lib_folder})
endif()
add_subdirectory(api)