diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-12-31 15:53:59 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-12-31 15:53:59 -0600 |
| commit | 9c2d671397974c05a1bdd8b386bc8267d78afd99 (patch) | |
| tree | 1dc088082b46cec02b8adac81a0f201b4a60b9a6 /src | |
| parent | Merge pull request #4944 (diff) | |
| parent | build: protobuf dependency fixes, libusb build (diff) | |
| download | monero-9c2d671397974c05a1bdd8b386bc8267d78afd99.tar.xz | |
Merge pull request #4945
e37154a build: protobuf dependency fixes, libusb build (ph4r05)
Diffstat (limited to 'src')
| -rw-r--r-- | src/device_trezor/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/wallet/CMakeLists.txt | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/device_trezor/CMakeLists.txt b/src/device_trezor/CMakeLists.txt index b27c843b6..7f979389a 100644 --- a/src/device_trezor/CMakeLists.txt +++ b/src/device_trezor/CMakeLists.txt @@ -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}) diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt index 8425e4a03..2991f75c5 100644 --- a/src/wallet/CMakeLists.txt +++ b/src/wallet/CMakeLists.txt @@ -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) |