Skip to content

Commit

Permalink
Don't use public linkage in wallet
Browse files Browse the repository at this point in the history
- Need to dig further into linkage to discern why DSO linking error only happens with OpenSSL & mnemomics libraries
  • Loading branch information
who-biz committed Jun 26, 2020
1 parent 9a4f0e8 commit 6a849da
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 5 deletions.
1 change: 0 additions & 1 deletion src/mnemonics/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ target_link_libraries(mnemonics
PUBLIC
epee
easylogging
${OPENSSL_LIBRARIES}
${Boost_SYSTEM_LIBRARY}
PRIVATE
${EXTRA_LIBRARIES})
1 change: 1 addition & 0 deletions src/simplewallet/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ target_link_libraries(simplewallet
${Boost_THREAD_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
${GNU_READLINE_LIBRARY}
${OPENSSL_LIBRARIES}
${EXTRA_LIBRARIES})
set_property(TARGET simplewallet
PROPERTY
Expand Down
2 changes: 0 additions & 2 deletions src/wallet/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ target_link_libraries(wallet
${Boost_SERIALIZATION_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${OPENSSL_LIBRARIES}
${Boost_THREAD_LIBRARY}
${Boost_REGEX_LIBRARY}
${EXTRA_LIBRARIES})
Expand Down Expand Up @@ -99,7 +98,6 @@ target_link_libraries(wallet_rpc_server
${Boost_FILESYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
${OPENSSL_LIBRARIES}
${EXTRA_LIBRARIES})
set_property(TARGET wallet_rpc_server
PROPERTY
Expand Down
3 changes: 1 addition & 2 deletions src/wallet/api/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ monero_add_library(wallet_api
${wallet_api_headers}
${wallet_api_private_headers})
target_link_libraries(wallet_api
PUBLIC
PRIVATE
wallet
common
cryptonote_core
Expand All @@ -76,7 +76,6 @@ target_link_libraries(wallet_api
${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY}
${Boost_REGEX_LIBRARY}
PRIVATE
${EXTRA_LIBRARIES})

set_property(TARGET wallet_api PROPERTY EXCLUDE_FROM_ALL TRUE)
Expand Down

0 comments on commit 6a849da

Please sign in to comment.