rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-23 11:23:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

split off readline code into epee_readline

Browse Source
This commit is contained in:
moneromooo-monero 2017-10-29 08:46:41 +00:00
parent a9e14a19dc
commit 178014c995
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
contrib/epee/src/CMakeLists.txt
View File

@ -26,10 +26,9 @@
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
if (USE_READLINE AND GNU_READLINE_FOUND)
add_library(epee STATIC hex.cpp http_auth.cpp mlog.cpp net_utils_base.cpp string_tools.cpp readline_buffer.cpp)
else()
add_library(epee STATIC hex.cpp http_auth.cpp mlog.cpp net_utils_base.cpp string_tools.cpp) add_library(epee STATIC hex.cpp http_auth.cpp mlog.cpp net_utils_base.cpp string_tools.cpp)
if (USE_READLINE AND GNU_READLINE_FOUND)
add_library(epee_readline STATIC readline_buffer.cpp)
endif() endif()
# Build and install libepee if we're building for GUI # Build and install libepee if we're building for GUI
@ -41,6 +40,10 @@ if (BUILD_GUI_DEPS)
endif() endif()
install(TARGETS epee install(TARGETS epee
ARCHIVE DESTINATION ${lib_folder}) ARCHIVE DESTINATION ${lib_folder})
if (USE_READLINE AND GNU_READLINE_FOUND)
install(TARGETS epee_readline
ARCHIVE DESTINATION ${lib_folder})
endif()
endif() endif()
target_link_libraries(epee target_link_libraries(epee
@ -51,3 +54,11 @@ target_link_libraries(epee
PRIVATE PRIVATE
${OPENSSL_LIBRARIES} ${OPENSSL_LIBRARIES}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
if (USE_READLINE AND GNU_READLINE_FOUND)
target_link_libraries(epee_readline
PUBLIC
easylogging
PRIVATE
${Readline_LIBRARY})
endif()

2
src/daemon/CMakeLists.txt
View File

@ -94,6 +94,8 @@ target_link_libraries(daemon
daemonizer daemonizer
serialization serialization
daemon_rpc_server daemon_rpc_server
epee
epee_readline
version version
${Boost_CHRONO_LIBRARY} ${Boost_CHRONO_LIBRARY}
${Boost_FILESYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}

2
src/simplewallet/CMakeLists.txt
View File

@ -48,6 +48,8 @@ target_link_libraries(simplewallet
cncrypto cncrypto
common common
mnemonics mnemonics
epee
epee_readline
version version
${Boost_CHRONO_LIBRARY} ${Boost_CHRONO_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}

1
src/wallet/CMakeLists.txt
View File

@ -108,6 +108,7 @@ if (NOT BUILD_GUI_DEPS)
PRIVATE PRIVATE
wallet wallet
epee epee
epee_readline
rpc rpc
cryptonote_core cryptonote_core
cncrypto cncrypto