Skip to content

Commit 2fb6140

Browse files
committed
Merge bitcoin#17404: Remove redundant class file include from test_bitcoin msvc project
b80f7db Remove redundant class file includes from test_bitcoin project. (Aaron Clauson) Pull request description: bitcoin#17364 & bitcoin#17384 overlapped and both added the same line of `..\..\src\test\util\*.cpp` to `test_bitcoin.vcxproj`. This didn't break the build but does result in duplicate symbol warnings. This PR cleans it up and removes the additional redundant line of `..\..\src\test\util\setup_common.cpp` which will also be covered by the wildcard include. ACKs for top commit: MarcoFalke: ACK b80f7db 🔅 fanquake: ACK b80f7db - tested a build on a Windows machine. No longer see the warnings shown below: Tree-SHA512: 55960821480483c517b475f2a6871cd7d4033d086db3fd679aa0de362e4f7e2c3ac7967ca278cc3728cc765ba23d4441ec769d83d7a47e7a3fa2f09de2bbc145
2 parents 2706162 + b80f7db commit 2fb6140

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

build_msvc/test_bitcoin/test_bitcoin.vcxproj

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@
99
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
1010
</PropertyGroup>
1111
<ItemGroup>
12-
<ClCompile Include="..\..\src\test\*_tests.cpp" />
1312
<ClCompile Include="..\..\src\test\*_properties.cpp" />
13+
<ClCompile Include="..\..\src\test\*_tests.cpp" />
1414
<ClCompile Include="..\..\src\test\gen\*_gen.cpp" />
15-
<ClCompile Include="..\..\src\wallet\test\*_tests.cpp" />
16-
<ClCompile Include="..\..\src\test\util\*.cpp" />
17-
<ClCompile Include="..\..\src\test\util\setup_common.cpp" />
1815
<ClCompile Include="..\..\src\test\main.cpp" />
19-
<ClCompile Include="..\..\src\wallet\test\*_fixture.cpp" />
2016
<ClCompile Include="..\..\src\test\util\*.cpp" />
17+
<ClCompile Include="..\..\src\wallet\test\*_fixture.cpp" />
18+
<ClCompile Include="..\..\src\wallet\test\*_tests.cpp" />
2119
</ItemGroup>
2220
<ItemGroup>
2321
<ProjectReference Include="..\libbitcoinconsensus\libbitcoinconsensus.vcxproj">

0 commit comments

Comments
 (0)