Skip to content

Commit 88e8c76

Browse files
evoskuilevoskuil
authored
Merge pull request #645 from evoskuil/master
Bump vc++ builds to boost 1.86, statically link boost test.
2 parents 579b63c + f89e728 commit 88e8c76

File tree

8 files changed

+257
-85
lines changed

8 files changed

+257
-85
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ClCompile>
1414
<AdditionalIncludeDirectories>$(RepoRoot)include\;(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1515
<EnablePREfast>false</EnablePREfast>
16-
<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
16+
<!--<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
1717
</ClCompile>
1818
<PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
1919
<Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>

‎builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj‎

Lines changed: 68 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" />
@@ -144,33 +192,33 @@
144192
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
145193
<ImportGroup Label="ExtensionTargets" />
146194
<ImportGroup Label="ExtensionSettings">
147-
<Import Project="$(NuGetPackageRoot)boost.1.78.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.78.0\build\boost.targets')" />
148-
<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')" />
149-
<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')" />
150-
<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')" />
151-
<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')" />
152-
<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')" />
153-
<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')" />
154-
<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')" />
155-
<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')" />
195+
<Import Project="$(NuGetPackageRoot)boost.1.86.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" />
196+
<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')" />
197+
<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')" />
198+
<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')" />
199+
<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')" />
200+
<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')" />
201+
<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')" />
202+
<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')" />
203+
<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')" />
156204
<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')" />
157-
<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')" />
205+
<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')" />
158206
</ImportGroup>
159207
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
160208
<PropertyGroup>
161209
<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>
162210
</PropertyGroup>
163-
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.78.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.78.0\build\boost.targets'))" />
164-
<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'))" />
165-
<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'))" />
166-
<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'))" />
167-
<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'))" />
168-
<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'))" />
169-
<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'))" />
170-
<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'))" />
171-
<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'))" />
211+
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.86.0\build\boost.targets'))" />
212+
<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'))" />
213+
<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'))" />
214+
<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'))" />
215+
<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'))" />
216+
<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'))" />
217+
<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'))" />
218+
<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'))" />
219+
<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'))" />
172220
<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'))" />
173-
<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'))" />
221+
<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'))" />
174222
</Target>
175223
<ItemGroup>
176224
<ProjectReference Include="..\libbitcoin-database\libbitcoin-database.vcxproj">

‎builds/msvc/vs2022/libbitcoin-database-test/packages.config‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
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_chrono-vc143" version="1.86.0" targetFramework="Native" />
11+
<package id="boost_container-vc143" version="1.86.0" targetFramework="Native" />
12+
<package id="boost_iostreams-vc143" version="1.86.0" targetFramework="Native" />
13+
<package id="boost_json-vc143" version="1.86.0" targetFramework="Native" />
14+
<package id="boost_locale-vc143" version="1.86.0" targetFramework="Native" />
15+
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
16+
<package id="boost_system-vc143" version="1.86.0" targetFramework="Native" />
17+
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
1818
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
19-
<package id="boost_unit_test_framework-vc143" version="1.78.0" targetFramework="Native" />
19+
<package id="boost_unit_test_framework-vc143" version="1.86.0" targetFramework="Native" />
2020
</packages>

0 commit comments

Comments
 (0)