monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-10 12:54:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3448

Browse source 
2cda1fc cmake: link with wallet_api instead of wallet_merged (selsta)
This commit is contained in:
luigi1111 2021-04-29 14:16:56 -04:00
commit 426dc3fa47
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -63,11 +63,7 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC 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(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") if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
add_definitions(-DQT_NO_DEBUG) add_definitions(-DQT_NO_DEBUG)

16
src/CMakeLists.txt
View file

@ -139,21 +139,11 @@ endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
target_link_libraries(monero-wallet-gui target_link_libraries(monero-wallet-gui
wallet_merged
${LMDB_LIBRARY}
epee epee
wallet_api
qrcodegen qrcodegen
${UNBOUND_LIBRARY}
${SODIUM_LIBRARY}
easylogging easylogging
blockchain_db
randomx
hardforks
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${OPENSSL_LIBRARIES}
${CMAKE_DL_LIBS}
${LibUSB_LIBRARIES}
${HIDAPI_LIBRARIES}
${QT5_LIBRARIES} ${QT5_LIBRARIES}
${EXTRA_LIBRARIES} ${EXTRA_LIBRARIES}
${ICU_LIBRARIES} ${ICU_LIBRARIES}
@ -162,10 +152,6 @@ target_link_libraries(monero-wallet-gui
translations translations
) )
if(DEVICE_TREZOR_READY)
target_link_libraries(monero-wallet-gui ${TREZOR_DEP_LIBS})
endif()
if(X11_FOUND) if(X11_FOUND)
target_link_libraries(monero-wallet-gui ${X11_LIBRARIES}) target_link_libraries(monero-wallet-gui ${X11_LIBRARIES})
endif() endif()