github
/
monero-gui
mirror of https://github.com/monero-project/monero-gui
1
Fork 0
Code Releases Activity

Merge pull request #2962 

27532dc cmake: fix USE_DEVICE_TREZOR option (xiphon)
This commit is contained in:
luigi1111 2020-06-19 16:16:57 -05:00
parent 8f5053bd61 27532dc1bf
commit 8354c251c5
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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)

7
src/CMakeLists.txt
View File

@ -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}