diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-07-05 23:45:33 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-07-05 23:45:33 -0500 |
| commit | 596b71b29378421d67d1c4660b3b872eec320805 (patch) | |
| tree | d66694d52da46deb9cdf17abfee0213be187156f /src | |
| parent | e0faddf964148ccad0e7207fd9bb8040ae4f9232 (diff) | |
| parent | 8159b75be36e8e4393bda09606e782de399ef50e (diff) | |
| download | monzero-gui-596b71b29378421d67d1c4660b3b872eec320805.tar.gz monzero-gui-596b71b29378421d67d1c4660b3b872eec320805.tar.xz monzero-gui-596b71b29378421d67d1c4660b3b872eec320805.zip | |
Merge pull request #2982
8159b75 cmake: fix monero-wallet-gui target dependencies (xiphon)
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2027e2fd..a1cc871d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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} |