diff options
| author | fanquake <fanquake@gmail.com> | 2019-11-07 15:17:30 -0500 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2019-11-07 15:42:25 -0500 |
| commit | 2fb6140d585fa05547415a6c440dc43b561e2439 (patch) | |
| tree | 67ce4c8e96b1079d5f39f45929624115236fc4fb | |
| parent | 270616228bc9a3856a0a82dea26ac3480b7585cd (diff) | |
| parent | b80f7db832390a1b43829c1d5857f382c45b0df6 (diff) | |
Merge #17404: Remove redundant class file include from test_bitcoin msvc project
b80f7db832390a1b43829c1d5857f382c45b0df6 Remove redundant class file includes from test_bitcoin project. (Aaron Clauson)
Pull request description:
#17364 & #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 b80f7db832390a1b43829c1d5857f382c45b0df6 🔅
fanquake:
ACK b80f7db832390a1b43829c1d5857f382c45b0df6 - tested a build on a Windows machine. No longer see the warnings shown below:
Tree-SHA512: 55960821480483c517b475f2a6871cd7d4033d086db3fd679aa0de362e4f7e2c3ac7967ca278cc3728cc765ba23d4441ec769d83d7a47e7a3fa2f09de2bbc145
| -rw-r--r-- | build_msvc/test_bitcoin/test_bitcoin.vcxproj | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/build_msvc/test_bitcoin/test_bitcoin.vcxproj b/build_msvc/test_bitcoin/test_bitcoin.vcxproj index aea961ec69..1d05ff6cba 100644 --- a/build_msvc/test_bitcoin/test_bitcoin.vcxproj +++ b/build_msvc/test_bitcoin/test_bitcoin.vcxproj @@ -9,15 +9,13 @@ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> </PropertyGroup> <ItemGroup> - <ClCompile Include="..\..\src\test\*_tests.cpp" /> <ClCompile Include="..\..\src\test\*_properties.cpp" /> + <ClCompile Include="..\..\src\test\*_tests.cpp" /> <ClCompile Include="..\..\src\test\gen\*_gen.cpp" /> - <ClCompile Include="..\..\src\wallet\test\*_tests.cpp" /> - <ClCompile Include="..\..\src\test\util\*.cpp" /> - <ClCompile Include="..\..\src\test\util\setup_common.cpp" /> <ClCompile Include="..\..\src\test\main.cpp" /> - <ClCompile Include="..\..\src\wallet\test\*_fixture.cpp" /> <ClCompile Include="..\..\src\test\util\*.cpp" /> + <ClCompile Include="..\..\src\wallet\test\*_fixture.cpp" /> + <ClCompile Include="..\..\src\wallet\test\*_tests.cpp" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\libbitcoinconsensus\libbitcoinconsensus.vcxproj"> |