From a6f7b829e1d9db107b30fd01e51d7d95bfefdb0b Mon Sep 17 00:00:00 2001
From: gladcow <s.gladkov@pbsa.info>
Date: Fri, 3 Apr 2020 12:21:06 +0300
Subject: [PATCH] correct include and lib path for libbitcoin

---
 libraries/plugins/libbitcoin/CMakeLists.txt | 19 +++++++++++--------
 tests/bitcoin_test/CMakeLists.txt           |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/libraries/plugins/libbitcoin/CMakeLists.txt b/libraries/plugins/libbitcoin/CMakeLists.txt
index e2353f49..594ff8d8 100644
--- a/libraries/plugins/libbitcoin/CMakeLists.txt
+++ b/libraries/plugins/libbitcoin/CMakeLists.txt
@@ -2,25 +2,28 @@ include(ExternalProject)
 
 set(LIBBITCOIN_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libbitcoin-system)
 set(LIBBITCOIN_BIN ${CMAKE_CURRENT_BINARY_DIR}/libbitcoin)
-set(LIBBITCOIN_STATIC_LIB ${LIBBITCOIN_BIN}/lib/libbitcoin.a)
-set(LIBBITCOIN_INCLUDES ${LIBBITCOIN_BIN}/include)
+set(LIBBITCOIN_STATIC_LIB ${LIBBITCOIN_BIN}/lib/libbitcoin-system.a)
+set(LIBBITCOIN_INCLUDES ${LIBBITCOIN_DIR}/include)
 
 file(MAKE_DIRECTORY ${LIBBITCOIN_INCLUDES})
 
 ExternalProject_Add(
-    libbitcoin
+    bitcoinsystem
     PREFIX ${LIBBITCOIN_BIN}
     SOURCE_DIR ${LIBBITCOIN_DIR}
     DOWNLOAD_COMMAND  cd ${LIBBITCOIN_DIR} && ${LIBBITCOIN_DIR}/autogen.sh
     CONFIGURE_COMMAND ${LIBBITCOIN_DIR}/configure --srcdir=${LIBBITCOIN_DIR} --prefix=${LIBBITCOIN_BIN} --enable-static=yes --disable-shared --with-examples=no
-    BUILD_COMMAND make
+    BUILD_COMMAND make -j4
     INSTALL_COMMAND make install
     BUILD_BYPRODUCTS ${LIBBITCOIN_STATIC_LIB}
 )
 
-add_library(bitcoin STATIC IMPORTED GLOBAL)
+add_library(libbitcoin STATIC IMPORTED GLOBAL)
 
-add_dependencies(bitcoin libbitcoin)
+set_target_properties(bitcoinsystem PROPERTIES IMPORTED_LOCATION ${LIBBITCOIN_STATIC_LIB})
+set_target_properties(bitcoinsystem PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${LIBBITCOIN_INCLUDES})
 
-set_target_properties(bitcoin PROPERTIES IMPORTED_LOCATION ${LIBBITCOIN_STATIC_LIB})
-set_target_properties(bitcoin PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${LIBBITCOIN_INCLUDES})
+add_dependencies(libbitcoin bitcoinsystem)
+
+set_target_properties(libbitcoin PROPERTIES IMPORTED_LOCATION ${LIBBITCOIN_STATIC_LIB})
+set_target_properties(libbitcoin PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${LIBBITCOIN_INCLUDES})
diff --git a/tests/bitcoin_test/CMakeLists.txt b/tests/bitcoin_test/CMakeLists.txt
index 747fd444..20439aa2 100644
--- a/tests/bitcoin_test/CMakeLists.txt
+++ b/tests/bitcoin_test/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_executable( bitcoin_test main.cpp )
 target_link_libraries( bitcoin_test
-                       PRIVATE bitcoin fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
+                       PRIVATE libbitcoin ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )