cmake: fix monero-wallet-gui target dependencies

This commit is contained in:
xiphon 2020-07-02 23:09:59 +00:00
parent e0faddf964
commit 8159b75be3
2 changed files with 7 additions and 17 deletions

View file

@ -486,7 +486,3 @@ if (HIDAPI_FOUND OR LibUSB_COMPILE_TEST_PASSED)
endif() endif()
add_subdirectory(src) add_subdirectory(src)
# Required to make wallet_merged build before the gui
add_dependencies(monero-wallet-gui wallet_merged)

View file

@ -126,22 +126,16 @@ target_compile_definitions(monero-wallet-gui
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") 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 target_link_libraries(monero-wallet-gui
${CMAKE_BINARY_DIR}/lib/libwallet_merged.a wallet_merged
${LMDB_LIBRARY} ${LMDB_LIBRARY}
${CMAKE_BINARY_DIR}/monero/contrib/epee/src/libepee.a epee
${UNBOUND_LIBRARY} unbound
${SODIUM_LIBRARY} ${SODIUM_LIBRARY}
${CMAKE_BINARY_DIR}/monero/external/easylogging++/libeasylogging.a easylogging
${CMAKE_BINARY_DIR}/monero/src/blockchain_db/libblockchain_db.a blockchain_db
${CMAKE_BINARY_DIR}/monero/external/randomx/librandomx.a randomx
${CMAKE_BINARY_DIR}/monero/src/hardforks/libhardforks.a hardforks
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${OPENSSL_LIBRARIES} ${OPENSSL_LIBRARIES}
${CMAKE_DL_LIBS} ${CMAKE_DL_LIBS}