Skip to content

Commit fc4bee3

Browse files
committed
Merge bitcoin/bitcoin#27687: msvc: Provide ObjectFileName explicitly
b8ed951 msvc: Provide `ObjectFileName` explicitly (Hennadii Stepanov) Pull request description: This PR is a follow-up to bitcoin/bitcoin#26715. Fixes intermittent MSVC link [errors](https://cirrus-ci.com/task/6646912535756800). ACKs for top commit: sipsorcery: ACK b8ed951. Tree-SHA512: 4319ecf61b578ce66d240998d089b9bb0a42f89dcfcb1a73f648cd3915f566c773721dcff1feba27d393a743d121334ccb890b1a519173e35a156d6135821ef4
2 parents 7be7e62 + b8ed951 commit fc4bee3

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,18 @@
1010
<ItemGroup>
1111
<ClCompile Include="..\..\src\init\bitcoin-qt.cpp" />
1212
<ClCompile Include="..\..\src\test\util\setup_common.cpp" />
13-
<ClCompile Include="..\..\src\wallet\test\util.cpp" />
13+
<ClCompile Include="..\..\src\wallet\test\util.cpp">
14+
<ObjectFileName>$(IntDir)wallet_test_util.obj</ObjectFileName>
15+
</ClCompile>
1416
<ClCompile Include="..\..\src\qt\test\addressbooktests.cpp" />
1517
<ClCompile Include="..\..\src\qt\test\apptests.cpp" />
1618
<ClCompile Include="..\..\src\qt\test\optiontests.cpp" />
1719
<ClCompile Include="..\..\src\qt\test\rpcnestedtests.cpp" />
1820
<ClCompile Include="..\..\src\qt\test\test_main.cpp" />
1921
<ClCompile Include="..\..\src\qt\test\uritests.cpp" />
20-
<ClCompile Include="..\..\src\qt\test\util.cpp" />
22+
<ClCompile Include="..\..\src\qt\test\util.cpp">
23+
<ObjectFileName>$(IntDir)qt_test_util.obj</ObjectFileName>
24+
</ClCompile>
2125
<ClCompile Include="..\..\src\qt\test\wallettests.cpp" />
2226
<ClCompile Include="..\..\src\wallet\test\wallet_test_fixture.cpp" />
2327
<ClCompile Include="$(GeneratedFilesOutDir)\moc\moc_addressbooktests.cpp" />

0 commit comments

Comments
 (0)