Skip to content

Commit

Permalink
Regenerate with boost 1.73.0 minimum version.
Browse files Browse the repository at this point in the history
  • Loading branch information
pmienk committed Sep 1, 2023
1 parent e878de3 commit 2084d89
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion builds/cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ endif()

# Find boost
#------------------------------------------------------------------------------
find_package( Boost 1.72.0 REQUIRED COMPONENTS
find_package( Boost 1.73.0 REQUIRED COMPONENTS
unit_test_framework )

set( boost_unit_test_framework_LIBS "-lboost_unit_test_framework" )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,16 @@
<ImportGroup Label="ExtensionTargets" />
<ImportGroup Label="ExtensionSettings">
<Import Project="$(NuGetPackageRoot)secp256k1_vc141.0.1.0.19\build\native\secp256k1_vc141.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc141.0.1.0.19\build\native\secp256k1_vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost.1.72.0.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.72.0.0\build\boost.targets')" />
<Import Project="$(NuGetPackageRoot)boost_unit_test_framework-vc141.1.72.0.0\build\boost_unit_test_framework-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc141.1.72.0.0\build\boost_unit_test_framework-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost.1.73.0.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.73.0.0\build\boost.targets')" />
<Import Project="$(NuGetPackageRoot)boost_unit_test_framework-vc141.1.73.0.0\build\boost_unit_test_framework-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc141.1.73.0.0\build\boost_unit_test_framework-vc141.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)secp256k1_vc141.0.1.0.19\build\native\secp256k1_vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc141.0.1.0.19\build\native\secp256k1_vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.72.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.72.0.0\build\boost.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc141.1.72.0.0\build\boost_unit_test_framework-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_unit_test_framework-vc141.1.72.0.0\build\boost_unit_test_framework-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.73.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.73.0.0\build\boost.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc141.1.73.0.0\build\boost_unit_test_framework-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_unit_test_framework-vc141.1.73.0.0\build\boost_unit_test_framework-vc141.targets'))" />
</Target>
<ItemGroup>
<ProjectReference Include="..\libbitcoin-consensus\libbitcoin-consensus.vcxproj">
Expand Down
4 changes: 2 additions & 2 deletions builds/msvc/vs2022/libbitcoin-consensus-test/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
-->
<packages>
<package id="secp256k1_vc141" version="0.1.0.19" targetFramework="Native" />
<package id="boost" version="1.72.0.0" targetFramework="Native" />
<package id="boost_unit_test_framework-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost" version="1.73.0.0" targetFramework="Native" />
<package id="boost_unit_test_framework-vc141" version="1.73.0.0" targetFramework="Native" />
</packages>
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -454,17 +454,17 @@ AS_CASE([${CC}], [*clang*],

# Check dependencies.
#==============================================================================
# Require Boost of at least version 1.72.0 and output ${boost_CPPFLAGS/LDFLAGS}.
# Require Boost of at least version 1.73.0 and output ${boost_CPPFLAGS/LDFLAGS}.
#------------------------------------------------------------------------------
AS_CASE([${CC}], [*],
[AX_BOOST_BASE([1.72.0],
[AX_BOOST_BASE([1.73.0],
[AC_SUBST([boost_CPPFLAGS], [${BOOST_CPPFLAGS}])
AC_SUBST([boost_ISYS_CPPFLAGS], [`echo ${BOOST_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`])
AC_SUBST([boost_LDFLAGS], [${BOOST_LDFLAGS}])
AC_MSG_NOTICE([boost_CPPFLAGS : ${boost_CPPFLAGS}])
AC_MSG_NOTICE([boost_ISYS_CPPFLAGS : ${boost_ISYS_CPPFLAGS}])
AC_MSG_NOTICE([boost_LDFLAGS : ${boost_LDFLAGS}])],
[AC_MSG_ERROR([Boost 1.72.0 or later is required but was not found.])])])
[AC_MSG_ERROR([Boost 1.73.0 or later is required but was not found.])])])

AS_CASE([${enable_isystem}],[yes],
[AC_SUBST([boost_BUILD_CPPFLAGS], [${boost_ISYS_CPPFLAGS}])],
Expand Down
4 changes: 2 additions & 2 deletions install-cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ PRESUMED_CI_PROJECT_PATH=$(pwd)

# Boost archive.
#------------------------------------------------------------------------------
BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.72.0/boost_1_72_0.tar.bz2"
BOOST_ARCHIVE="boost_1_72_0.tar.bz2"
BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.73.0/boost_1_73_0.tar.bz2"
BOOST_ARCHIVE="boost_1_73_0.tar.bz2"


# Define utility functions.
Expand Down
4 changes: 2 additions & 2 deletions install-cmakepresets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ PRESUMED_CI_PROJECT_PATH=$(pwd)

# Boost archive.
#------------------------------------------------------------------------------
BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.72.0/boost_1_72_0.tar.bz2"
BOOST_ARCHIVE="boost_1_72_0.tar.bz2"
BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.73.0/boost_1_73_0.tar.bz2"
BOOST_ARCHIVE="boost_1_73_0.tar.bz2"


# Define utility functions.
Expand Down
4 changes: 2 additions & 2 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ PRESUMED_CI_PROJECT_PATH=$(pwd)

# Boost archive.
#------------------------------------------------------------------------------
BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.72.0/boost_1_72_0.tar.bz2"
BOOST_ARCHIVE="boost_1_72_0.tar.bz2"
BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.73.0/boost_1_73_0.tar.bz2"
BOOST_ARCHIVE="boost_1_73_0.tar.bz2"


# Define utility functions.
Expand Down

0 comments on commit 2084d89

Please sign in to comment.