diff options
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/blockchain_utilities/CMakeLists.txt | 23 | ||||
| -rw-r--r-- | src/debug_utilities/CMakeLists.txt | 50 | ||||
| -rw-r--r-- | src/debug_utilities/cn_deserialize.cpp (renamed from src/blockchain_utilities/cn_deserialize.cpp) | 3 |
4 files changed, 52 insertions, 25 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d83242a3c..4b54c60fc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -118,6 +118,7 @@ if(NOT IOS) add_subdirectory(daemonizer) add_subdirectory(daemon) add_subdirectory(blockchain_utilities) + add_subdirectory(debug_utilities) endif() if(PER_BLOCK_CHECKPOINT) diff --git a/src/blockchain_utilities/CMakeLists.txt b/src/blockchain_utilities/CMakeLists.txt index bb23cdc8b..58d26832e 100644 --- a/src/blockchain_utilities/CMakeLists.txt +++ b/src/blockchain_utilities/CMakeLists.txt @@ -58,11 +58,6 @@ monero_private_headers(blockchain_export ${blockchain_export_private_headers}) -set(cn_deserialize_sources - cn_deserialize.cpp - ) - - monero_add_executable(blockchain_import ${blockchain_import_sources} ${blockchain_import_private_headers}) @@ -112,21 +107,3 @@ set_property(TARGET blockchain_export PROPERTY OUTPUT_NAME "monero-blockchain-export") -monero_add_executable(cn_deserialize - ${cn_deserialize_sources} - ${cn_deserialize_private_headers}) - -target_link_libraries(cn_deserialize - LINK_PRIVATE - cryptonote_core - blockchain_db - p2p - epee - ${CMAKE_THREAD_LIBS_INIT}) - -add_dependencies(cn_deserialize - version) -set_property(TARGET cn_deserialize - PROPERTY - OUTPUT_NAME "monero-utils-deserialize") - diff --git a/src/debug_utilities/CMakeLists.txt b/src/debug_utilities/CMakeLists.txt new file mode 100644 index 000000000..233e6fd46 --- /dev/null +++ b/src/debug_utilities/CMakeLists.txt @@ -0,0 +1,50 @@ +# Copyright (c) 2014-2017, The Monero Project +# +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, are +# permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other +# materials provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be +# used to endorse or promote products derived from this software without specific +# prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +# 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. + +set(cn_deserialize_sources + cn_deserialize.cpp + ) + +monero_add_executable(cn_deserialize + ${cn_deserialize_sources} + ${cn_deserialize_private_headers}) + +target_link_libraries(cn_deserialize + LINK_PRIVATE + cryptonote_core + blockchain_db + p2p + epee + ${CMAKE_THREAD_LIBS_INIT}) + +add_dependencies(cn_deserialize + version) +set_property(TARGET cn_deserialize + PROPERTY + OUTPUT_NAME "monero-utils-deserialize") + diff --git a/src/blockchain_utilities/cn_deserialize.cpp b/src/debug_utilities/cn_deserialize.cpp index b178e4e03..a1b569554 100644 --- a/src/blockchain_utilities/cn_deserialize.cpp +++ b/src/debug_utilities/cn_deserialize.cpp @@ -29,12 +29,11 @@ #include "cryptonote_basic/cryptonote_basic.h" #include "cryptonote_basic/tx_extra.h" #include "cryptonote_core/blockchain.h" -#include "blockchain_utilities.h" #include "common/command_line.h" #include "version.h" #undef MONERO_DEFAULT_LOG_CATEGORY -#define MONERO_DEFAULT_LOG_CATEGORY "bcutil" +#define MONERO_DEFAULT_LOG_CATEGORY "debugtools.deserialize" namespace po = boost::program_options; using namespace epee; |