diff options
| author | fanquake <fanquake@gmail.com> | 2024-03-04 10:38:00 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-03-04 10:38:10 +0000 |
| commit | 98f57cd198baf8ac0bc236a80aa62c43d27fe27f (patch) | |
| tree | 51524ae1b81f5dda5680eeb11a598e7c5c89bd59 | |
| parent | 776d48dd5606747eb947a07acfa2ec67d9424602 (diff) | |
| parent | 6962c66b4a9657fd2a6fcca8e9a31beb90d13924 (diff) | |
| download | bitcoin-98f57cd198baf8ac0bc236a80aa62c43d27fe27f.tar.xz | |
Merge bitcoin/bitcoin#29533: build, msvc: Do not compile redundant sources
6962c66b4a9657fd2a6fcca8e9a31beb90d13924 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 6962c66b4a9657fd2a6fcca8e9a31beb90d13924.
Tree-SHA512: 5c40f52f3c7df3fff994fb136d4b2779ade3857fa14cf167d3f8600f28e821294e3779ebd4f4ab10ad57bdc8e952f99f6eb211e746a986ec24e26c7d1a74c04f
| -rw-r--r-- | build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj b/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj index c5a32a9711..7b4b73ca21 100644 --- a/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj +++ b/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj @@ -9,19 +9,13 @@ </PropertyGroup> <ItemGroup> <ClCompile Include="..\..\src\init\bitcoin-qt.cpp" /> - <ClCompile Include="..\..\src\test\util\setup_common.cpp" /> - <ClCompile Include="..\..\src\wallet\test\util.cpp"> - <ObjectFileName>$(IntDir)wallet_test_util.obj</ObjectFileName> - </ClCompile> <ClCompile Include="..\..\src\qt\test\addressbooktests.cpp" /> <ClCompile Include="..\..\src\qt\test\apptests.cpp" /> <ClCompile Include="..\..\src\qt\test\optiontests.cpp" /> <ClCompile Include="..\..\src\qt\test\rpcnestedtests.cpp" /> <ClCompile Include="..\..\src\qt\test\test_main.cpp" /> <ClCompile Include="..\..\src\qt\test\uritests.cpp" /> - <ClCompile Include="..\..\src\qt\test\util.cpp"> - <ObjectFileName>$(IntDir)qt_test_util.obj</ObjectFileName> - </ClCompile> + <ClCompile Include="..\..\src\qt\test\util.cpp" /> <ClCompile Include="..\..\src\qt\test\wallettests.cpp" /> <ClCompile Include="..\..\src\wallet\test\wallet_test_fixture.cpp" /> <ClCompile Include="$(GeneratedFilesOutDir)\moc\moc_addressbooktests.cpp" /> |