diff options
| author | Riccardo Spagni <ric@spagni.net> | 2014-10-05 11:40:25 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2014-10-05 11:40:25 +0200 |
| commit | 434095d1f7ddfaef44e61173f56a243e6d215159 (patch) | |
| tree | 8ffe82bdadf53bc50c052b50b2ee2ee6922c02de /src/CMakeLists.txt | |
| parent | Merge pull request #169 (diff) | |
| parent | Uses new Japanese file. Gives credit to dabura667. English file indentation t... (diff) | |
| download | monero-434095d1f7ddfaef44e61173f56a243e6d215159.tar.xz | |
fixed conflict in CMakeLists
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5f6d7551e..2393213cb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -41,6 +41,7 @@ file(GLOB_RECURSE SIMPLEWALLET simplewallet/*) file(GLOB_RECURSE CONN_TOOL connectivity_tool/*) file(GLOB_RECURSE WALLET wallet/*) file(GLOB_RECURSE MINER miner/*) +file(GLOB MNEMONICS mnemonics/*) source_group(common FILES ${COMMON}) source_group(crypto FILES ${CRYPTO}) @@ -53,10 +54,12 @@ source_group(simplewallet FILES ${SIMPLEWALLET}) source_group(connectivity-tool FILES ${CONN_TOOL}) source_group(wallet FILES ${WALLET}) source_group(simpleminer FILES ${MINER}) +source_group(mnemonics FILES ${MNEMONICS}) add_library(common ${COMMON}) add_library(crypto ${CRYPTO}) add_library(cryptonote_core ${CRYPTONOTE_CORE}) +add_library(mnemonics ${MNEMONICS}) add_executable(daemon ${DAEMON} ${P2P} ${CRYPTONOTE_PROTOCOL}) add_executable(connectivity_tool ${CONN_TOOL}) add_executable(simpleminer ${MINER}) @@ -65,8 +68,9 @@ target_link_libraries(connectivity_tool cryptonote_core crypto common ${UNBOUND_ target_link_libraries(simpleminer cryptonote_core crypto common ${UNBOUND_LIBRARIES} ${Boost_LIBRARIES}) add_library(rpc ${RPC}) add_library(wallet ${WALLET}) +target_link_libraries(wallet mnemonics) add_executable(simplewallet ${SIMPLEWALLET} ) -target_link_libraries(simplewallet wallet rpc cryptonote_core crypto common ${UNBOUND_LIBRARIES} ${UPNP_LIBRARIES} ${Boost_LIBRARIES}) +target_link_libraries(simplewallet wallet rpc cryptonote_core crypto common mnemonics ${UNBOUND_LIBRARIES} ${UPNP_LIBRARIES} ${Boost_LIBRARIES}) add_dependencies(daemon version) add_dependencies(rpc version) add_dependencies(simplewallet version) |