diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2022-04-05 20:31:38 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2022-04-05 20:31:42 +0200 |
| commit | 15220ec9039ac330dbc6fd53fa06424cde04d0b6 (patch) | |
| tree | 80ecc773f3f39dc0d99d6e21b006e57038cf0ff9 /test/README.md | |
| parent | 9ce1c506a3a5d20b1bf254235bfae48af592d86c (diff) | |
| parent | ba0bf79a224d92e122f98fda94cb9f77092fea1f (diff) | |
| download | bitcoin-15220ec9039ac330dbc6fd53fa06424cde04d0b6.tar.xz | |
Merge bitcoin/bitcoin#24775: build: Do not modify `common.init.vcxproj` directly
ba0bf79a224d92e122f98fda94cb9f77092fea1f build: Do not modify `common.init.vcxproj` directly (Hennadii Stepanov)
2391fb785063b8914738ef16dc8d9294ca251253 build, refactor: Add set_properties() to msvc-autogen.py (Hennadii Stepanov)
Pull request description:
When building with MSVC, and using a non-default toolset, the following command
```
>python build_msvc\msvc-autogen.py -toolset v143
```
actually modifies the source tree:
```diff
>git diff
warning: LF will be replaced by CRLF in build_msvc/common.init.vcxproj.
The file will have its original line endings in your working directory
diff --git a/build_msvc/common.init.vcxproj b/build_msvc/common.init.vcxproj
index 0cbe2effd..44b7efff3 100644
--- a/build_msvc/common.init.vcxproj
+++ b/build_msvc/common.init.vcxproj
@@ -39,7 +39,7 @@
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
<LinkIncremental>false</LinkIncremental>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<GenerateManifest>No</GenerateManifest>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
@@ -49,7 +49,7 @@
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
<LinkIncremental>true</LinkIncremental>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
```
This PR fixes this bug.
ACKs for top commit:
sipsorcery:
tACK ba0bf79a224d92e122f98fda94cb9f77092fea1f.
Tree-SHA512: 614662fdbce6aea7a09fac5bba1e3632dd921b0d8f89c448566f527bf5df049ae6bacd951662825188b88324aec7e3416b58237e0a227d7520e2a75223b0edd0
Diffstat (limited to 'test/README.md')
0 files changed, 0 insertions, 0 deletions