diff options
| author | fanquake <fanquake@gmail.com> | 2023-05-19 12:32:04 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-05-19 12:32:22 +0100 |
| commit | fc4bee3f196e9b4685b62b5e2ecb83a6bc33676a (patch) | |
| tree | 32f528cc9b349a581a1148cebaa7f8093f2d4b89 /build_msvc | |
| parent | 7be7e62fdf4623e0cc680ea8205750c16414453e (diff) | |
| parent | b8ed95127b23873db973b2ef4f68d9f04e9c23ae (diff) | |
Merge bitcoin/bitcoin#27687: msvc: Provide `ObjectFileName` explicitly
b8ed95127b23873db973b2ef4f68d9f04e9c23ae msvc: Provide `ObjectFileName` explicitly (Hennadii Stepanov)
Pull request description:
This PR is a follow-up to https://github.com/bitcoin/bitcoin/pull/26715.
Fixes intermittent MSVC link [errors](https://cirrus-ci.com/task/6646912535756800).
ACKs for top commit:
sipsorcery:
ACK b8ed95127b23873db973b2ef4f68d9f04e9c23ae.
Tree-SHA512: 4319ecf61b578ce66d240998d089b9bb0a42f89dcfcb1a73f648cd3915f566c773721dcff1feba27d393a743d121334ccb890b1a519173e35a156d6135821ef4
Diffstat (limited to 'build_msvc')
| -rw-r--r-- | build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj b/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj index ac4518e0f2..3776317fc7 100644 --- a/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj +++ b/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj @@ -10,14 +10,18 @@ <ItemGroup> <ClCompile Include="..\..\src\init\bitcoin-qt.cpp" /> <ClCompile Include="..\..\src\test\util\setup_common.cpp" /> - <ClCompile Include="..\..\src\wallet\test\util.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" /> + <ClCompile Include="..\..\src\qt\test\util.cpp"> + <ObjectFileName>$(IntDir)qt_test_util.obj</ObjectFileName> + </ClCompile> <ClCompile Include="..\..\src\qt\test\wallettests.cpp" /> <ClCompile Include="..\..\src\wallet\test\wallet_test_fixture.cpp" /> <ClCompile Include="$(GeneratedFilesOutDir)\moc\moc_addressbooktests.cpp" /> |