From 27532dc1bf6646b73d928d5ca8ac8a26140347be Mon Sep 17 00:00:00 2001 From: xiphon Date: Wed, 17 Jun 2020 11:37:36 +0000 Subject: [PATCH] cmake: fix USE_DEVICE_TREZOR option --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fd37d60..3354703f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}") option(STATIC "Link libraries statically, requires static Qt") -option(USE_DEVICE_TREZOR ON) +option(USE_DEVICE_TREZOR "Trezor support compilation" ON) option(ENABLE_PASS_STRENGTH_METER "Disable zxcvbn" OFF) option(WITH_SCANNER "Enable webcam QR scanner" OFF) option(DEV_MODE "Checkout latest monero master on build" OFF) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index eb83cb0c..cc940e96 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -130,9 +130,6 @@ if(X11_FOUND) target_link_libraries(monero-wallet-gui ${X11_LIBRARIES} pthread dl xcb X11) endif() -if(DEVICE_TREZOR_READY) - target_link_libraries(monero-wallet-gui ${TREZOR_DEP_LIBS}) -endif() if(INSTALL_VENDORED_LIBUNBOUND) set(UNBOUND_LIBRARY ${CMAKE_BINARY_DIR}/monero/external/unbound/libunbound.a) @@ -161,6 +158,10 @@ target_link_libraries(monero-wallet-gui openpgp ) +if(DEVICE_TREZOR_READY) + target_link_libraries(monero-wallet-gui ${TREZOR_DEP_LIBS}) +endif() + if(WITH_SCANNER) target_link_libraries(monero-wallet-gui ${ZBAR_LIBRARIES}