Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions builds/cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,7 @@ set( libbitcoin_database_VERSION ${libbitcoin-database_VERSION} )
find_package( libbitcoin-network 4.0.0 REQUIRED )
set( libbitcoin_network_VERSION ${libbitcoin-network_VERSION} )

find_package( Boost 1.86.0 REQUIRED
COMPONENTS
unit_test_framework
)
find_package( Boost 1.86.0 REQUIRED )

#------------------------------------------------------------------------------
# Compiler options.
Expand Down Expand Up @@ -310,7 +307,7 @@ if ( with-tests )

target_link_libraries( libbitcoin-node-test
PRIVATE
Boost::unit_test_framework
Boost::headers
bitcoin::node
)

Expand Down
6 changes: 1 addition & 5 deletions builds/cmake/install-cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -468,11 +468,7 @@ main()
"-Wno-enum-constexpr-conversion")

boost_OPTIONS=(
"--with-container"
"--with-json"
"--with-program_options"
"--with-url"
"--with-test")
"--with-headers")

secp256k1_FLAGS=(
"-w")
Expand Down
6 changes: 1 addition & 5 deletions builds/cmake/install-presets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -484,11 +484,7 @@ main()
"-Wno-enum-constexpr-conversion")

boost_OPTIONS=(
"--with-container"
"--with-json"
"--with-program_options"
"--with-url"
"--with-test")
"--with-headers")

secp256k1_FLAGS=(
"-w")
Expand Down
3 changes: 0 additions & 3 deletions builds/gnu/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -204,17 +204,14 @@ check_PROGRAMS = test/libbitcoin-node-test

test_libbitcoin_node_test_CPPFLAGS = \
${boost_BUILD_CPPFLAGS} \
${boost_unit_test_framework_BUILD_CPPFLAGS} \
${src_libbitcoin_node_la_CPPFLAGS}

test_libbitcoin_node_test_LDFLAGS = \
${boost_LDFLAGS} \
${boost_unit_test_framework_LDFLAGS} \
${src_libbitcoin_node_la_LDFLAGS}

test_libbitcoin_node_test_LDADD = \
${boost_LIBS} \
${boost_unit_test_framework_LIBS} \
${src_libbitcoin_node_la_LIBS} \
${src_libbitcoin_node_la_LIBADD}

Expand Down
7 changes: 0 additions & 7 deletions builds/gnu/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -290,13 +290,6 @@ AS_IF([test "x${enable_isystem}" != "xno"],

AC_MSG_NOTICE([boost_BUILD_CPPFLAGS : ${boost_BUILD_CPPFLAGS}])

AS_IF([(test "x${with_tests}" != "xno")],
[
AX_BOOST_UNIT_TEST_FRAMEWORK
AC_SUBST([boost_unit_test_framework_LIBS], [${BOOST_UNIT_TEST_FRAMEWORK_LIB}])
AC_MSG_NOTICE([boost_unit_test_framework_LIBS : ${boost_unit_test_framework_LIBS}])
])

AC_CONFIG_FILES([
Makefile
libbitcoin-node.pc
Expand Down
6 changes: 1 addition & 5 deletions builds/gnu/install-gnu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -499,11 +499,7 @@ main()
"-Wno-enum-constexpr-conversion")

boost_OPTIONS=(
"--with-container"
"--with-json"
"--with-program_options"
"--with-url"
"--with-test")
"--with-headers")

secp256k1_FLAGS=(
"-w")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,23 +132,13 @@
<ImportGroup Label="ExtensionTargets" />
<ImportGroup Label="ExtensionSettings">
<Import Project="$(NuGetPackageRoot)libbitcoin-boost.1.91.0.1\build\libbitcoin-boost.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost.1.91.0.1\build\libbitcoin-boost.targets')" />
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_container-vc145.1.91.0.1\build\libbitcoin-boost_container-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_container-vc145.1.91.0.1\build\libbitcoin-boost_container-vc145.targets')" />
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_json-vc145.1.91.0.1\build\libbitcoin-boost_json-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_json-vc145.1.91.0.1\build\libbitcoin-boost_json-vc145.targets')" />
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_program_options-vc145.1.91.0.1\build\libbitcoin-boost_program_options-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_program_options-vc145.1.91.0.1\build\libbitcoin-boost_program_options-vc145.targets')" />
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_unit_test_framework-vc145.1.91.0.1\build\libbitcoin-boost_unit_test_framework-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_unit_test_framework-vc145.1.91.0.1\build\libbitcoin-boost_unit_test_framework-vc145.targets')" />
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0.1\build\libbitcoin-boost_url-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0.1\build\libbitcoin-boost_url-vc145.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1_vc145.0.8.0\build\native\secp256k1_vc145.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc145.0.8.0\build\native\secp256k1_vc145.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The Missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost.1.91.0.1\build\libbitcoin-boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost.1.91.0.1\build\libbitcoin-boost.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_container-vc145.1.91.0.1\build\libbitcoin-boost_container-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_container-vc145.1.91.0.1\build\libbitcoin-boost_container-vc145.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_json-vc145.1.91.0.1\build\libbitcoin-boost_json-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_json-vc145.1.91.0.1\build\libbitcoin-boost_json-vc145.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_program_options-vc145.1.91.0.1\build\libbitcoin-boost_program_options-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_program_options-vc145.1.91.0.1\build\libbitcoin-boost_program_options-vc145.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_unit_test_framework-vc145.1.91.0.1\build\libbitcoin-boost_unit_test_framework-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_unit_test_framework-vc145.1.91.0.1\build\libbitcoin-boost_unit_test_framework-vc145.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0.1\build\libbitcoin-boost_url-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0.1\build\libbitcoin-boost_url-vc145.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc145.0.8.0\build\native\secp256k1_vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc145.0.8.0\build\native\secp256k1_vc145.targets'))" />
</Target>
<ItemGroup>
Expand Down
5 changes: 0 additions & 5 deletions builds/msvc/vs2026/libbitcoin-node-test/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,5 @@
-->
<packages>
<package id="libbitcoin-boost" version="1.91.0.1" targetFramework="Native" />
<package id="libbitcoin-boost_container-vc145" version="1.91.0.1" targetFramework="Native" />
<package id="libbitcoin-boost_json-vc145" version="1.91.0.1" targetFramework="Native" />
<package id="libbitcoin-boost_program_options-vc145" version="1.91.0.1" targetFramework="Native" />
<package id="libbitcoin-boost_unit_test_framework-vc145" version="1.91.0.1" targetFramework="Native" />
<package id="libbitcoin-boost_url-vc145" version="1.91.0.1" targetFramework="Native" />
<package id="secp256k1_vc145" version="0.8.0" targetFramework="Native" />
</packages>
8 changes: 0 additions & 8 deletions builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -226,21 +226,13 @@
<ImportGroup Label="ExtensionTargets" />
<ImportGroup Label="ExtensionSettings">
<Import Project="$(NuGetPackageRoot)libbitcoin-boost.1.91.0.1\build\libbitcoin-boost.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost.1.91.0.1\build\libbitcoin-boost.targets')" />
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_container-vc145.1.91.0.1\build\libbitcoin-boost_container-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_container-vc145.1.91.0.1\build\libbitcoin-boost_container-vc145.targets')" />
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_json-vc145.1.91.0.1\build\libbitcoin-boost_json-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_json-vc145.1.91.0.1\build\libbitcoin-boost_json-vc145.targets')" />
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_program_options-vc145.1.91.0.1\build\libbitcoin-boost_program_options-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_program_options-vc145.1.91.0.1\build\libbitcoin-boost_program_options-vc145.targets')" />
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0.1\build\libbitcoin-boost_url-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0.1\build\libbitcoin-boost_url-vc145.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1_vc145.0.8.0\build\native\secp256k1_vc145.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc145.0.8.0\build\native\secp256k1_vc145.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The Missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost.1.91.0.1\build\libbitcoin-boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost.1.91.0.1\build\libbitcoin-boost.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_container-vc145.1.91.0.1\build\libbitcoin-boost_container-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_container-vc145.1.91.0.1\build\libbitcoin-boost_container-vc145.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_json-vc145.1.91.0.1\build\libbitcoin-boost_json-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_json-vc145.1.91.0.1\build\libbitcoin-boost_json-vc145.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_program_options-vc145.1.91.0.1\build\libbitcoin-boost_program_options-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_program_options-vc145.1.91.0.1\build\libbitcoin-boost_program_options-vc145.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0.1\build\libbitcoin-boost_url-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0.1\build\libbitcoin-boost_url-vc145.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc145.0.8.0\build\native\secp256k1_vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc145.0.8.0\build\native\secp256k1_vc145.targets'))" />
</Target>
<ItemGroup>
Expand Down
4 changes: 0 additions & 4 deletions builds/msvc/vs2026/libbitcoin-node/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,5 @@
-->
<packages>
<package id="libbitcoin-boost" version="1.91.0.1" targetFramework="Native" />
<package id="libbitcoin-boost_container-vc145" version="1.91.0.1" targetFramework="Native" />
<package id="libbitcoin-boost_json-vc145" version="1.91.0.1" targetFramework="Native" />
<package id="libbitcoin-boost_program_options-vc145" version="1.91.0.1" targetFramework="Native" />
<package id="libbitcoin-boost_url-vc145" version="1.91.0.1" targetFramework="Native" />
<package id="secp256k1_vc145" version="0.8.0" targetFramework="Native" />
</packages>
2 changes: 1 addition & 1 deletion test/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define BOOST_TEST_MODULE libbitcoin_node_test
#include <boost/test/unit_test.hpp>
#include <boost/test/included/unit_test.hpp>
Loading