diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2021-04-29 14:16:56 -0400 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2021-04-29 14:16:56 -0400 |
| commit | 426dc3fa4764b8ae31802d3894bb3b382e10be02 (patch) | |
| tree | a9d64e5931932b39b6d81e47df86ee1fbe238399 | |
| parent | 947a70a638ab2ae4d121ce45a6cf0e885d576e3d (diff) | |
| parent | 2cda1fca696bcfb56551f9a4d158dc9417657033 (diff) | |
| download | monzero-gui-426dc3fa4764b8ae31802d3894bb3b382e10be02.tar.gz monzero-gui-426dc3fa4764b8ae31802d3894bb3b382e10be02.tar.xz monzero-gui-426dc3fa4764b8ae31802d3894bb3b382e10be02.zip | |
Merge pull request #3448
2cda1fc cmake: link with wallet_api instead of wallet_merged (selsta)
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 16 |
2 files changed, 1 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ca52fa1..b2ae3413 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,11 +63,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set_property(TARGET wallet_merged PROPERTY FOLDER "monero") get_directory_property(ARCH_WIDTH DIRECTORY "monero" DEFINITION ARCH_WIDTH) -get_directory_property(UNBOUND_LIBRARY DIRECTORY "monero" DEFINITION UNBOUND_LIBRARY) -get_directory_property(DEVICE_TREZOR_READY DIRECTORY "monero" DEFINITION DEVICE_TREZOR_READY) -get_directory_property(TREZOR_DEP_LIBS DIRECTORY "monero" DEFINITION TREZOR_DEP_LIBS) if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug") add_definitions(-DQT_NO_DEBUG) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5ca8ca0f..23e034f0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -139,21 +139,11 @@ endif() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") target_link_libraries(monero-wallet-gui - wallet_merged - ${LMDB_LIBRARY} epee + wallet_api qrcodegen - ${UNBOUND_LIBRARY} - ${SODIUM_LIBRARY} easylogging - blockchain_db - randomx - hardforks ${Boost_LIBRARIES} - ${OPENSSL_LIBRARIES} - ${CMAKE_DL_LIBS} - ${LibUSB_LIBRARIES} - ${HIDAPI_LIBRARIES} ${QT5_LIBRARIES} ${EXTRA_LIBRARIES} ${ICU_LIBRARIES} @@ -162,10 +152,6 @@ target_link_libraries(monero-wallet-gui translations ) -if(DEVICE_TREZOR_READY) - target_link_libraries(monero-wallet-gui ${TREZOR_DEP_LIBS}) -endif() - if(X11_FOUND) target_link_libraries(monero-wallet-gui ${X11_LIBRARIES}) endif() |