Skip to content

Commit 98f57cd

Browse files
committed
Merge bitcoin/bitcoin#29533: build, msvc: Do not compile redundant sources
6962c66 build, msvc: Do not compile redundant sources (Hennadii Stepanov) Pull request description: The `test\util\setup_common.cpp` and `wallet\test\util.cpp` sources are already compiled and included in the `libtest_util` library, which is linked to the `test_bitcoin-qt.exe` binary. This PR follows the same logic as `Makefile.qttest.include`. Useful for comparing project files across the master branch and the developing [cmake-staging](https://github.com/hebasto/bitcoin/tree/cmake-staging) branch. ACKs for top commit: sipsorcery: utACK 6962c66. Tree-SHA512: 5c40f52f3c7df3fff994fb136d4b2779ade3857fa14cf167d3f8600f28e821294e3779ebd4f4ab10ad57bdc8e952f99f6eb211e746a986ec24e26c7d1a74c04f
2 parents 776d48d + 6962c66 commit 98f57cd

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,13 @@
99
</PropertyGroup>
1010
<ItemGroup>
1111
<ClCompile Include="..\..\src\init\bitcoin-qt.cpp" />
12-
<ClCompile Include="..\..\src\test\util\setup_common.cpp" />
13-
<ClCompile Include="..\..\src\wallet\test\util.cpp">
14-
<ObjectFileName>$(IntDir)wallet_test_util.obj</ObjectFileName>
15-
</ClCompile>
1612
<ClCompile Include="..\..\src\qt\test\addressbooktests.cpp" />
1713
<ClCompile Include="..\..\src\qt\test\apptests.cpp" />
1814
<ClCompile Include="..\..\src\qt\test\optiontests.cpp" />
1915
<ClCompile Include="..\..\src\qt\test\rpcnestedtests.cpp" />
2016
<ClCompile Include="..\..\src\qt\test\test_main.cpp" />
2117
<ClCompile Include="..\..\src\qt\test\uritests.cpp" />
22-
<ClCompile Include="..\..\src\qt\test\util.cpp">
23-
<ObjectFileName>$(IntDir)qt_test_util.obj</ObjectFileName>
24-
</ClCompile>
18+
<ClCompile Include="..\..\src\qt\test\util.cpp" />
2519
<ClCompile Include="..\..\src\qt\test\wallettests.cpp" />
2620
<ClCompile Include="..\..\src\wallet\test\wallet_test_fixture.cpp" />
2721
<ClCompile Include="$(GeneratedFilesOutDir)\moc\moc_addressbooktests.cpp" />

0 commit comments

Comments
 (0)