Skip to content

Commit 122a878

Browse files
evoskuilevoskuil
authored
Merge pull request #781 from evoskuil/master
Bump vc++ builds to boost 1.86, statically link boost test.
2 parents 5ea7f6e + 321a40e commit 122a878

14 files changed

Lines changed: 230 additions & 111 deletions

‎builds/cmake/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ endif()
148148

149149
# Find boost
150150
#------------------------------------------------------------------------------
151-
find_package( Boost 1.76.0 REQUIRED COMPONENTS
151+
find_package( Boost 1.86.0 REQUIRED COMPONENTS
152152
unit_test_framework )
153153

154154
set( boost_unit_test_framework_LIBS "-lboost_unit_test_framework" )

‎builds/msvc/vs2022/bn/bn.vcxproj‎

Lines changed: 58 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,54 @@
6161
<Configuration>ReleaseSEXE</Configuration>
6262
<Platform>x64</Platform>
6363
</ProjectConfiguration>
64+
<ProjectConfiguration Include="DebugDEXE|ARM">
65+
<Configuration>DebugDEXE</Configuration>
66+
<Platform>ARM</Platform>
67+
</ProjectConfiguration>
68+
<ProjectConfiguration Include="ReleaseDEXE|ARM">
69+
<Configuration>ReleaseDEXE</Configuration>
70+
<Platform>ARM</Platform>
71+
</ProjectConfiguration>
72+
<ProjectConfiguration Include="DebugDEXE|ARM64">
73+
<Configuration>DebugDEXE</Configuration>
74+
<Platform>ARM64</Platform>
75+
</ProjectConfiguration>
76+
<ProjectConfiguration Include="ReleaseDEXE|ARM64">
77+
<Configuration>ReleaseDEXE</Configuration>
78+
<Platform>ARM64</Platform>
79+
</ProjectConfiguration>
80+
<ProjectConfiguration Include="DebugLEXE|ARM">
81+
<Configuration>DebugLEXE</Configuration>
82+
<Platform>ARM</Platform>
83+
</ProjectConfiguration>
84+
<ProjectConfiguration Include="ReleaseLEXE|ARM">
85+
<Configuration>ReleaseLEXE</Configuration>
86+
<Platform>ARM</Platform>
87+
</ProjectConfiguration>
88+
<ProjectConfiguration Include="DebugLEXE|ARM64">
89+
<Configuration>DebugLEXE</Configuration>
90+
<Platform>ARM64</Platform>
91+
</ProjectConfiguration>
92+
<ProjectConfiguration Include="ReleaseLEXE|ARM64">
93+
<Configuration>ReleaseLEXE</Configuration>
94+
<Platform>ARM64</Platform>
95+
</ProjectConfiguration>
96+
<ProjectConfiguration Include="DebugSEXE|ARM">
97+
<Configuration>DebugSEXE</Configuration>
98+
<Platform>ARM</Platform>
99+
</ProjectConfiguration>
100+
<ProjectConfiguration Include="ReleaseSEXE|ARM">
101+
<Configuration>ReleaseSEXE</Configuration>
102+
<Platform>ARM</Platform>
103+
</ProjectConfiguration>
104+
<ProjectConfiguration Include="DebugSEXE|ARM64">
105+
<Configuration>DebugSEXE</Configuration>
106+
<Platform>ARM64</Platform>
107+
</ProjectConfiguration>
108+
<ProjectConfiguration Include="ReleaseSEXE|ARM64">
109+
<Configuration>ReleaseSEXE</Configuration>
110+
<Platform>ARM64</Platform>
111+
</ProjectConfiguration>
64112
</ItemGroup>
65113
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
66114
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -99,33 +147,23 @@
99147
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
100148
<ImportGroup Label="ExtensionTargets" />
101149
<ImportGroup Label="ExtensionSettings">
102-
<Import Project="$(NuGetPackageRoot)boost.1.78.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.78.0\build\boost.targets')" />
103-
<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')" />
104-
<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')" />
105-
<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')" />
106-
<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')" />
107-
<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')" />
108-
<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')" />
109-
<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')" />
110-
<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')" />
150+
<Import Project="$(NuGetPackageRoot)boost.1.86.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" />
151+
<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')" />
152+
<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')" />
153+
<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')" />
154+
<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')" />
111155
<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')" />
112-
<Import Project="$(NuGetPackageRoot)boost_regex-vc143.1.78.0\build\boost_regex-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_regex-vc143.1.78.0\build\boost_regex-vc143.targets')" />
113156
</ImportGroup>
114157
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
115158
<PropertyGroup>
116159
<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>
117160
</PropertyGroup>
118-
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.78.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.78.0\build\boost.targets'))" />
119-
<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'))" />
120-
<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'))" />
121-
<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'))" />
122-
<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'))" />
123-
<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'))" />
124-
<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'))" />
125-
<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'))" />
126-
<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'))" />
161+
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.86.0\build\boost.targets'))" />
162+
<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'))" />
163+
<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'))" />
164+
<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'))" />
165+
<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'))" />
127166
<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'))" />
128-
<Error Condition="!Exists('$(NuGetPackageRoot)boost_regex-vc143.1.78.0\build\boost_regex-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_regex-vc143.1.78.0\build\boost_regex-vc143.targets'))" />
129167
</Target>
130168
<ItemGroup>
131169
<ProjectReference Include="..\libbitcoin-node\libbitcoin-node.vcxproj">

‎builds/msvc/vs2022/bn/packages.config‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,10 @@
66
|
77
-->
88
<packages>
9-
<package id="boost" version="1.78.0" targetFramework="Native" />
10-
<package id="boost_chrono-vc143" version="1.78.0" targetFramework="Native" />
11-
<package id="boost_container-vc143" version="1.78.0" targetFramework="Native" />
12-
<package id="boost_iostreams-vc143" version="1.78.0" targetFramework="Native" />
13-
<package id="boost_json-vc143" version="1.78.0" targetFramework="Native" />
14-
<package id="boost_locale-vc143" version="1.78.0" targetFramework="Native" />
15-
<package id="boost_program_options-vc143" version="1.78.0" targetFramework="Native" />
16-
<package id="boost_system-vc143" version="1.78.0" targetFramework="Native" />
17-
<package id="boost_thread-vc143" version="1.78.0" targetFramework="Native" />
9+
<package id="boost" version="1.86.0" targetFramework="Native" />
10+
<package id="boost_iostreams-vc143" version="1.86.0" targetFramework="Native" />
11+
<package id="boost_locale-vc143" version="1.86.0" targetFramework="Native" />
12+
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
13+
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
1814
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
19-
<package id="boost_regex-vc143" version="1.78.0" targetFramework="Native" />
2015
</packages>

‎builds/msvc/vs2022/libbitcoin-node-test/libbitcoin-node-test.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<ItemDefinitionGroup>
1313
<ClCompile>
1414
<EnablePREfast>false</EnablePREfast>
15-
<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1615
</ClCompile>
1716
<PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
1817
<Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>

0 commit comments

Comments
 (0)