From 8146af00c446f8bce0ab78fafefd9aef5d63f488 Mon Sep 17 00:00:00 2001 From: evoskuil Date: Wed, 14 Feb 2024 15:38:03 -0500 Subject: [PATCH 1/2] Add generated artifact (conditionally include consensus). --- include/bitcoin/node.hpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/bitcoin/node.hpp b/include/bitcoin/node.hpp index 81a01d08..4c8d3490 100644 --- a/include/bitcoin/node.hpp +++ b/include/bitcoin/node.hpp @@ -14,7 +14,12 @@ * Maintainers: Do not include this header internal to this library. */ -////#include +#include + +#ifdef WITH_CONSENSUS +#include +#endif + #include #include #include From 1d2eb0d136fdd6eec231e46ae29219ed88027d88 Mon Sep 17 00:00:00 2001 From: evoskuil Date: Wed, 14 Feb 2024 17:36:43 -0500 Subject: [PATCH 2/2] Remove dead code. --- .../modules/FindBitcoin-Blockchain.cmake | 60 ------------------- 1 file changed, 60 deletions(-) delete mode 100644 builds/cmake/modules/FindBitcoin-Blockchain.cmake diff --git a/builds/cmake/modules/FindBitcoin-Blockchain.cmake b/builds/cmake/modules/FindBitcoin-Blockchain.cmake deleted file mode 100644 index c85b8ce1..00000000 --- a/builds/cmake/modules/FindBitcoin-Blockchain.cmake +++ /dev/null @@ -1,60 +0,0 @@ -############################################################################### -# Copyright (c) 2014-2023 libbitcoin-node developers (see COPYING). -# -# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY -# -############################################################################### -# FindBitcoin-Blockchain -# -# Use this module by invoking find_package with the form:: -# -# find_package( Bitcoin-Blockchain -# [version] # Minimum version -# [REQUIRED] # Fail with error if bitcoin-blockchain is not found -# ) -# -# Defines the following for use: -# -# bitcoin_blockchain_FOUND - true if headers and requested libraries were found -# bitcoin_blockchain_INCLUDE_DIRS - include directories for bitcoin-blockchain libraries -# bitcoin_blockchain_LIBRARY_DIRS - link directories for bitcoin-blockchain libraries -# bitcoin_blockchain_LIBRARIES - bitcoin-blockchain libraries to be linked -# bitcoin_blockchain_PKG - bitcoin-blockchain pkg-config package specification. -# - -if (MSVC) - if ( Bitcoin-Blockchain_FIND_REQUIRED ) - set( _bitcoin_blockchain_MSG_STATUS "SEND_ERROR" ) - else () - set( _bitcoin_blockchain_MSG_STATUS "STATUS" ) - endif() - - set( bitcoin_blockchain_FOUND false ) - message( ${_bitcoin_blockchain_MSG_STATUS} "MSVC environment detection for 'bitcoin-blockchain' not currently supported." ) -else () - # required - if ( Bitcoin-Blockchain_FIND_REQUIRED ) - set( _bitcoin_blockchain_REQUIRED "REQUIRED" ) - endif() - - # quiet - if ( Bitcoin-Blockchain_FIND_QUIETLY ) - set( _bitcoin_blockchain_QUIET "QUIET" ) - endif() - - # modulespec - if ( Bitcoin-Blockchain_FIND_VERSION_COUNT EQUAL 0 ) - set( _bitcoin_blockchain_MODULE_SPEC "libbitcoin-blockchain" ) - else () - if ( Bitcoin-Blockchain_FIND_VERSION_EXACT ) - set( _bitcoin_blockchain_MODULE_SPEC_OP "=" ) - else () - set( _bitcoin_blockchain_MODULE_SPEC_OP ">=" ) - endif() - - set( _bitcoin_blockchain_MODULE_SPEC "libbitcoin-blockchain ${_bitcoin_blockchain_MODULE_SPEC_OP} ${Bitcoin-Blockchain_FIND_VERSION}" ) - endif() - - pkg_check_modules( bitcoin_blockchain ${_bitcoin_blockchain_REQUIRED} ${_bitcoin_blockchain_QUIET} "${_bitcoin_blockchain_MODULE_SPEC}" ) - set( bitcoin_blockchain_PKG "${_bitcoin_blockchain_MODULE_SPEC}" ) -endif()