mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-12-23 12:09:57 +00:00
Merge pull request #2982
8159b75
cmake: fix monero-wallet-gui target dependencies (xiphon)
This commit is contained in:
commit
596b71b293
2 changed files with 7 additions and 17 deletions
|
@ -486,7 +486,3 @@ if (HIDAPI_FOUND OR LibUSB_COMPILE_TEST_PASSED)
|
|||
endif()
|
||||
|
||||
add_subdirectory(src)
|
||||
|
||||
# Required to make wallet_merged build before the gui
|
||||
add_dependencies(monero-wallet-gui wallet_merged)
|
||||
|
||||
|
|
|
@ -126,22 +126,16 @@ target_compile_definitions(monero-wallet-gui
|
|||
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
|
||||
|
||||
if(INSTALL_VENDORED_LIBUNBOUND)
|
||||
set(UNBOUND_LIBRARY ${CMAKE_BINARY_DIR}/monero/external/unbound/libunbound.a)
|
||||
else()
|
||||
set(UNBOUND_LIBRARY unbound)
|
||||
endif()
|
||||
|
||||
target_link_libraries(monero-wallet-gui
|
||||
${CMAKE_BINARY_DIR}/lib/libwallet_merged.a
|
||||
wallet_merged
|
||||
${LMDB_LIBRARY}
|
||||
${CMAKE_BINARY_DIR}/monero/contrib/epee/src/libepee.a
|
||||
${UNBOUND_LIBRARY}
|
||||
epee
|
||||
unbound
|
||||
${SODIUM_LIBRARY}
|
||||
${CMAKE_BINARY_DIR}/monero/external/easylogging++/libeasylogging.a
|
||||
${CMAKE_BINARY_DIR}/monero/src/blockchain_db/libblockchain_db.a
|
||||
${CMAKE_BINARY_DIR}/monero/external/randomx/librandomx.a
|
||||
${CMAKE_BINARY_DIR}/monero/src/hardforks/libhardforks.a
|
||||
easylogging
|
||||
blockchain_db
|
||||
randomx
|
||||
hardforks
|
||||
${Boost_LIBRARIES}
|
||||
${OPENSSL_LIBRARIES}
|
||||
${CMAKE_DL_LIBS}
|
||||
|
|
Loading…
Reference in a new issue