aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-11-06 21:35:08 +0200
committerRiccardo Spagni <ric@spagni.net>2018-11-06 21:35:08 +0200
commita9e03ebc6a710f8616367dfa54a218a6b712ae30 (patch)
tree0fe35010a80bf0bb30e47aaac336957608a341c2 /src/wallet
parentMerge pull request #4713 (diff)
parentFix build of monero-gui by adding device_trezor to wallet_merged (diff)
downloadmonero-a9e03ebc6a710f8616367dfa54a218a6b712ae30.tar.xz
Merge pull request #4809
1fd017cf Fix build of monero-gui by adding device_trezor to wallet_merged (buricl)
Diffstat (limited to 'src/wallet')
-rw-r--r--src/wallet/CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt
index 4932dd4b6..4e3fb1ae5 100644
--- a/src/wallet/CMakeLists.txt
+++ b/src/wallet/CMakeLists.txt
@@ -120,7 +120,8 @@ if (BUILD_GUI_DEPS)
ringct
ringct_basic
checkpoints
- version)
+ version
+ device_trezor)
foreach(lib ${libs_to_merge})
list(APPEND objlibs $<TARGET_OBJECTS:obj_${lib}>) # matches naming convention in src/CMakeLists.txt