Skip to content

Bump vc++ builds to boost 1.86, statically link boost test. #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evoskuil merged 1 commit into from
May 25, 2025
Merged

Bump vc++ builds to boost 1.86, statically link boost test. #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion builds/msvc/vs2022/libbitcoin-protocol-test/libbitcoin-protocol-test.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<ItemDefinitionGroup>
<ClCompile>
<EnablePREfast>false</EnablePREfast>
<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<!--<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
</ClCompile>
<PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
<Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>
Expand Down
88 changes: 68 additions & 20 deletions builds/msvc/vs2022/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,54 @@
<Configuration>ReleaseSEXE</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="DebugDEXE|ARM">
<Configuration>DebugDEXE</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="ReleaseDEXE|ARM">
<Configuration>ReleaseDEXE</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="DebugDEXE|ARM64">
<Configuration>DebugDEXE</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="ReleaseDEXE|ARM64">
<Configuration>ReleaseDEXE</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="DebugLEXE|ARM">
<Configuration>DebugLEXE</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="ReleaseLEXE|ARM">
<Configuration>ReleaseLEXE</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="DebugLEXE|ARM64">
<Configuration>DebugLEXE</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="ReleaseLEXE|ARM64">
<Configuration>ReleaseLEXE</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="DebugSEXE|ARM">
<Configuration>DebugSEXE</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="ReleaseSEXE|ARM">
<Configuration>ReleaseSEXE</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="DebugSEXE|ARM64">
<Configuration>DebugSEXE</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="ReleaseSEXE|ARM64">
<Configuration>ReleaseSEXE</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Expand Down Expand Up @@ -94,35 +142,35 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
<ImportGroup Label="ExtensionSettings">
<Import Project="$(NuGetPackageRoot)boost.1.78.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.78.0\build\boost.targets')" />
<Import Project="$(NuGetPackageRoot)boost.1.86.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" />
<Import Project="$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets" Condition="Exists('$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_chrono-vc143.1.78.0\build\boost_chrono-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_chrono-vc143.1.78.0\build\boost_chrono-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_container-vc143.1.78.0\build\boost_container-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_container-vc143.1.78.0\build\boost_container-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_iostreams-vc143.1.78.0\build\boost_iostreams-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_iostreams-vc143.1.78.0\build\boost_iostreams-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_json-vc143.1.78.0\build\boost_json-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_json-vc143.1.78.0\build\boost_json-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_locale-vc143.1.78.0\build\boost_locale-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_locale-vc143.1.78.0\build\boost_locale-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_program_options-vc143.1.78.0\build\boost_program_options-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.78.0\build\boost_program_options-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_system-vc143.1.78.0\build\boost_system-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_system-vc143.1.78.0\build\boost_system-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_thread-vc143.1.78.0\build\boost_thread-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc143.1.78.0\build\boost_thread-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_chrono-vc143.1.86.0\build\boost_chrono-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_chrono-vc143.1.86.0\build\boost_chrono-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_system-vc143.1.86.0\build\boost_system-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_system-vc143.1.86.0\build\boost_system-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.78.0\build\boost_unit_test_framework-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.78.0\build\boost_unit_test_framework-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.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)boost.1.78.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.78.0\build\boost.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.86.0\build\boost.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_chrono-vc143.1.78.0\build\boost_chrono-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_chrono-vc143.1.78.0\build\boost_chrono-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_container-vc143.1.78.0\build\boost_container-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_container-vc143.1.78.0\build\boost_container-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_iostreams-vc143.1.78.0\build\boost_iostreams-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_iostreams-vc143.1.78.0\build\boost_iostreams-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_json-vc143.1.78.0\build\boost_json-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_json-vc143.1.78.0\build\boost_json-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_locale-vc143.1.78.0\build\boost_locale-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_locale-vc143.1.78.0\build\boost_locale-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.78.0\build\boost_program_options-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc143.1.78.0\build\boost_program_options-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_system-vc143.1.78.0\build\boost_system-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_system-vc143.1.78.0\build\boost_system-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc143.1.78.0\build\boost_thread-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc143.1.78.0\build\boost_thread-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_chrono-vc143.1.86.0\build\boost_chrono-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_chrono-vc143.1.86.0\build\boost_chrono-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_system-vc143.1.86.0\build\boost_system-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_system-vc143.1.86.0\build\boost_system-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.78.0\build\boost_unit_test_framework-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.78.0\build\boost_unit_test_framework-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets'))" />
</Target>
<ItemGroup>
<ProjectReference Include="..\libbitcoin-protocol\libbitcoin-protocol.vcxproj">
Expand Down
20 changes: 10 additions & 10 deletions builds/msvc/vs2022/libbitcoin-protocol-test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
|
-->
<packages>
<package id="boost" version="1.78.0" targetFramework="Native" />
<package id="boost" version="1.86.0" targetFramework="Native" />
<package id="libzmq_vc143" version="4.3.2" targetFramework="Native" />
<package id="boost_chrono-vc143" version="1.78.0" targetFramework="Native" />
<package id="boost_container-vc143" version="1.78.0" targetFramework="Native" />
<package id="boost_iostreams-vc143" version="1.78.0" targetFramework="Native" />
<package id="boost_json-vc143" version="1.78.0" targetFramework="Native" />
<package id="boost_locale-vc143" version="1.78.0" targetFramework="Native" />
<package id="boost_program_options-vc143" version="1.78.0" targetFramework="Native" />
<package id="boost_system-vc143" version="1.78.0" targetFramework="Native" />
<package id="boost_thread-vc143" version="1.78.0" targetFramework="Native" />
<package id="boost_chrono-vc143" version="1.86.0" targetFramework="Native" />
<package id="boost_container-vc143" version="1.86.0" targetFramework="Native" />
<package id="boost_iostreams-vc143" version="1.86.0" targetFramework="Native" />
<package id="boost_json-vc143" version="1.86.0" targetFramework="Native" />
<package id="boost_locale-vc143" version="1.86.0" targetFramework="Native" />
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
<package id="boost_system-vc143" version="1.86.0" targetFramework="Native" />
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
<package id="boost_unit_test_framework-vc143" version="1.78.0" targetFramework="Native" />
<package id="boost_unit_test_framework-vc143" version="1.86.0" targetFramework="Native" />
</packages>
20 changes: 20 additions & 0 deletions builds/msvc/vs2022/libbitcoin-protocol.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ Global
StaticDebug|x64 = StaticDebug|x64
StaticRelease|Win32 = StaticRelease|Win32
StaticRelease|x64 = StaticRelease|x64
StaticDebug|ARM = StaticDebug|ARM
StaticDebug|ARM64 = StaticDebug|ARM64
StaticRelease|ARM = StaticRelease|ARM
StaticRelease|ARM64 = StaticRelease|ARM64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{6B94E2A5-C054-4790-963D-A7BE493259B0}.StaticDebug|Win32.ActiveCfg = DebugLIB|Win32
Expand All @@ -23,6 +27,14 @@ Global
{6B94E2A5-C054-4790-963D-A7BE493259B0}.StaticRelease|Win32.Build.0 = ReleaseLIB|Win32
{6B94E2A5-C054-4790-963D-A7BE493259B0}.StaticRelease|x64.ActiveCfg = ReleaseLIB|x64
{6B94E2A5-C054-4790-963D-A7BE493259B0}.StaticRelease|x64.Build.0 = ReleaseLIB|x64
{6B94E2A5-C054-4790-963D-A7BE493259B0}.StaticDebug|ARM.ActiveCfg = DebugLIB|ARM
{6B94E2A5-C054-4790-963D-A7BE493259B0}.StaticDebug|ARM.Build.0 = DebugLIB|ARM
{6B94E2A5-C054-4790-963D-A7BE493259B0}.StaticDebug|ARM64.ActiveCfg = DebugLIB|ARM64
{6B94E2A5-C054-4790-963D-A7BE493259B0}.StaticDebug|ARM64.Build.0 = DebugLIB|ARM64
{6B94E2A5-C054-4790-963D-A7BE493259B0}.StaticRelease|ARM.ActiveCfg = ReleaseLIB|ARM
{6B94E2A5-C054-4790-963D-A7BE493259B0}.StaticRelease|ARM.Build.0 = ReleaseLIB|ARM
{6B94E2A5-C054-4790-963D-A7BE493259B0}.StaticRelease|ARM64.ActiveCfg = ReleaseLIB|ARM64
{6B94E2A5-C054-4790-963D-A7BE493259B0}.StaticRelease|ARM64.Build.0 = ReleaseLIB|ARM64
{C42BE17B-063D-44F1-A5BB-9F8295144B70}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
{C42BE17B-063D-44F1-A5BB-9F8295144B70}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
{C42BE17B-063D-44F1-A5BB-9F8295144B70}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
Expand All @@ -31,6 +43,14 @@ Global
{C42BE17B-063D-44F1-A5BB-9F8295144B70}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
{C42BE17B-063D-44F1-A5BB-9F8295144B70}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
{C42BE17B-063D-44F1-A5BB-9F8295144B70}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
{C42BE17B-063D-44F1-A5BB-9F8295144B70}.StaticDebug|ARM.ActiveCfg = DebugSEXE|ARM
{C42BE17B-063D-44F1-A5BB-9F8295144B70}.StaticDebug|ARM.Build.0 = DebugSEXE|ARM
{C42BE17B-063D-44F1-A5BB-9F8295144B70}.StaticDebug|ARM64.ActiveCfg = DebugSEXE|ARM64
{C42BE17B-063D-44F1-A5BB-9F8295144B70}.StaticDebug|ARM64.Build.0 = DebugSEXE|ARM64
{C42BE17B-063D-44F1-A5BB-9F8295144B70}.StaticRelease|ARM.ActiveCfg = ReleaseSEXE|ARM
{C42BE17B-063D-44F1-A5BB-9F8295144B70}.StaticRelease|ARM.Build.0 = ReleaseSEXE|ARM
{C42BE17B-063D-44F1-A5BB-9F8295144B70}.StaticRelease|ARM64.ActiveCfg = ReleaseSEXE|ARM64
{C42BE17B-063D-44F1-A5BB-9F8295144B70}.StaticRelease|ARM64.Build.0 = ReleaseSEXE|ARM64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Loading
Loading