aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHoward Chu <hyc@symas.com>2017-10-29 14:51:51 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-11-14 17:06:37 +0000
commit0d9c0db99679e9372a1cd8a97cfef76a18096ab6 (patch)
tree7f3c5330b240962ceb09fdb0986fffcb1220cad3
parentsplit off readline code into epee_readline (diff)
downloadmonero-0d9c0db99679e9372a1cd8a97cfef76a18096ab6.tar.xz
Do not build against epee_readline if it was not built
-rw-r--r--CMakeLists.txt1
-rw-r--r--src/daemon/CMakeLists.txt2
-rw-r--r--src/simplewallet/CMakeLists.txt2
-rw-r--r--src/wallet/CMakeLists.txt2
4 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index df0b22895..72afd5212 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -689,6 +689,7 @@ if(USE_READLINE)
add_definitions(-DHAVE_READLINE)
include_directories(${Readline_INCLUDE_DIR})
message(STATUS "Found readline library at: ${Readline_ROOT_DIR}")
+ set(EPEE_READLINE epee_readline)
else()
message(STATUS "Could not find GNU readline library so building without readline support")
endif()
diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
index 5d9b6d38e..2f9c2b2f9 100644
--- a/src/daemon/CMakeLists.txt
+++ b/src/daemon/CMakeLists.txt
@@ -95,7 +95,7 @@ target_link_libraries(daemon
serialization
daemon_rpc_server
epee
- epee_readline
+ ${EPEE_READLINE}
version
${Boost_CHRONO_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
diff --git a/src/simplewallet/CMakeLists.txt b/src/simplewallet/CMakeLists.txt
index 861358efc..3ff4466fc 100644
--- a/src/simplewallet/CMakeLists.txt
+++ b/src/simplewallet/CMakeLists.txt
@@ -49,7 +49,7 @@ target_link_libraries(simplewallet
common
mnemonics
epee
- epee_readline
+ ${EPEE_READLINE}
version
${Boost_CHRONO_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt
index 56f4a0497..7e061f480 100644
--- a/src/wallet/CMakeLists.txt
+++ b/src/wallet/CMakeLists.txt
@@ -108,7 +108,7 @@ if (NOT BUILD_GUI_DEPS)
PRIVATE
wallet
epee
- epee_readline
+ ${EPEE_READLINE}
rpc
cryptonote_core
cncrypto