diff options
| author | mj-xmr <mjxmr@protonmail.com> | 2021-03-02 09:50:20 +0100 |
|---|---|---|
| committer | mj-xmr <mjxmr@protonmail.com> | 2021-04-24 09:45:51 +0200 |
| commit | b4fe7c24013c86a59087ae7f0dfe9875c794f5be (patch) | |
| tree | fd630df9ebc42359bf7c9ccfba225a32dd3e957b /contrib | |
| parent | Merge pull request #7669 (diff) | |
| download | monero-b4fe7c24013c86a59087ae7f0dfe9875c794f5be.tar.xz | |
epee linkage dynamic; move monero_add_library to main CMakeLists.txt
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/epee/src/CMakeLists.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/epee/src/CMakeLists.txt b/contrib/epee/src/CMakeLists.txt index 368f49c95..b4cc7aa8a 100644 --- a/contrib/epee/src/CMakeLists.txt +++ b/contrib/epee/src/CMakeLists.txt @@ -34,7 +34,7 @@ file(GLOB EPEE_HEADERS_PUBLIC "${EPEE_INCLUDE_DIR_BASE}/**/*.h*" # Any number of subdirs will be included. ) -add_library(epee STATIC byte_slice.cpp byte_stream.cpp hex.cpp abstract_http_client.cpp http_auth.cpp mlog.cpp net_helper.cpp net_utils_base.cpp string_tools.cpp +monero_add_library(epee byte_slice.cpp byte_stream.cpp hex.cpp abstract_http_client.cpp http_auth.cpp mlog.cpp net_helper.cpp net_utils_base.cpp string_tools.cpp wipeable_string.cpp levin_base.cpp memwipe.c connection_basic.cpp network_throttle.cpp network_throttle-detail.cpp mlocker.cpp buffer.cpp net_ssl.cpp int-util.cpp portable_storage.cpp misc_language.cpp @@ -47,7 +47,7 @@ add_library(epee STATIC byte_slice.cpp byte_stream.cpp hex.cpp abstract_http_cli ) if (USE_READLINE AND (GNU_READLINE_FOUND OR (DEPENDS AND NOT MINGW))) - add_library(epee_readline STATIC readline_buffer.cpp) + monero_add_library(epee_readline readline_buffer.cpp) endif() if(HAVE_C11) @@ -75,8 +75,9 @@ target_link_libraries(epee ${Boost_CHRONO_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} - PRIVATE + ${Boost_REGEX_LIBRARY} ${OPENSSL_LIBRARIES} + PRIVATE ${EXTRA_LIBRARIES}) if (USE_READLINE AND (GNU_READLINE_FOUND OR (DEPENDS AND NOT MINGW))) |