Skip to content

Commit 83aef13

Browse files
authored
Merge pull request #392 from evoskuil/master
Add wolfssl warnings suppression.
2 parents 627b31b + 4c36042 commit 83aef13

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

props/version4/project/libbitcoin-network/libbitcoin-network-test/libbitcoin-network-test.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<Target Name="WolfSSLTestSuppressions" BeforeTargets="ClCompile">
2626
<ItemGroup>
2727
<ClCompile Update="@(ClCompile)">
28-
<AdditionalOptions Condition="$([System.String]::new('%(RelativeDir)').StartsWith('..\..\..\..\test\ssl\wolfssl\'))">/wd4005 /wd4189 /wd4245 /wd4267 /wd4701 /wd4702 /wd4703 %(AdditionalOptions)</AdditionalOptions>
28+
<AdditionalOptions Condition="$([System.String]::new('%(RelativeDir)').StartsWith('..\..\..\..\test\ssl\wolfssl\'))">/wd4005 /wd4189 /wd4244 /wd4245 /wd4267 /wd4701 /wd4702 /wd4703 %(AdditionalOptions)</AdditionalOptions>
2929
</ClCompile>
3030
</ItemGroup>
3131
</Target>

props/version4/project/libbitcoin-network/libbitcoin-network/libbitcoin-network.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@
4343
<!-- These are only used as inlined headers, so never compile them directly. -->
4444
<ExcludedFromBuild Condition="$([System.String]::new('%(RelativeDir)').StartsWith('..\..\..\..\scr\ssl\wolfssl\src\'))">true</ExcludedFromBuild>
4545
<ExcludedFromBuild Condition="$([System.String]::new('%(RelativeDir)').StartsWith('..\..\..\..\include\bitcoin\network\ssl\wolfcrypt\src\'))">true</ExcludedFromBuild>
46-
47-
<!-- Exclude wolfssl sources when ssl is deselected (requires external linkage). -->
48-
<ExcludedFromBuild Condition="$([System.String]::new('%(RelativeDir)').StartsWith('..\..\..\..\include\bitcoin\network\ssl\wolfcrypt\src\')) And '$(Option-ssl)' == 'false'">true</ExcludedFromBuild>
4946
</ClCompile>
5047
</ItemGroup>
5148
</Target>

0 commit comments

Comments
 (0)