Skip to content

Commit f89f47f

Browse files
DefaultRyanDefaultRyan
authored
Stop manually downloading hardcoded version of llvm/clang. (#1478)
* Stop manually downloading different version of llvm. Just use the one included in Visual Studio * Replace "custom llvm" msbuild props with PlatformToolset=ClangCl * Also disable the custom llvm install for test runs * Overriding ExecutablePath was causing clang-cl problems
1 parent 76eb09c commit f89f47f

File tree

9 files changed

+2
-60
lines changed

9 files changed

+2
-60
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ jobs:
2525
steps:
2626
- uses: actions/checkout@v4
2727

28-
- id: setup-llvm
29-
name: Set up LLVM (MSVC)
30-
uses: ./.github/actions/setup-llvm-msvc
31-
if: matrix.compiler == 'clang-cl'
32-
3328
- name: Download nuget
3429
run: |
3530
mkdir ".\.nuget"
@@ -49,7 +44,7 @@ jobs:
4944
$target_version = "1.2.3.4"
5045
$props = "Configuration=$target_configuration,Platform=$target_platform,CppWinRTBuildVersion=$target_version"
5146
if ("${{ matrix.compiler }}" -eq "clang-cl") {
52-
$props += ",Clang=1,PlatformToolset=LLVM_v143,LLVMInstallDir=${{ steps.setup-llvm.outputs.llvm-path }}"
47+
$props += ",Clang=1,PlatformToolset=ClangCl"
5348
}
5449
Add-Content $env:GITHUB_ENV "msbuild_config_props=/p:$props"
5550
@@ -109,11 +104,6 @@ jobs:
109104
steps:
110105
- uses: actions/checkout@v4
111106

112-
- id: setup-llvm
113-
name: Set up LLVM (MSVC)
114-
uses: ./.github/actions/setup-llvm-msvc
115-
if: matrix.compiler == 'clang-cl'
116-
117107
- name: Fetch cppwinrt executables
118108
if: matrix.arch != 'arm64'
119109
uses: actions/download-artifact@v4
@@ -147,7 +137,7 @@ jobs:
147137
$target_version = "1.2.3.4"
148138
$props = "Configuration=$target_configuration,Platform=$target_platform,CppWinRTBuildVersion=$target_version"
149139
if ("${{ matrix.compiler }}" -eq "clang-cl") {
150-
$props += ",Clang=1,PlatformToolset=LLVM_v143,LLVMInstallDir=${{ steps.setup-llvm.outputs.llvm-path }}"
140+
$props += ",Clang=1,PlatformToolset=ClangCl"
151141
}
152142
Add-Content $env:GITHUB_ENV "msbuild_config_props=/p:$props"
153143

‎test/old_tests/Component/Component.vcxproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,37 +94,31 @@
9494
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9595
<GenerateManifest>false</GenerateManifest>
9696
<IgnoreImportLibrary>false</IgnoreImportLibrary>
97-
<ExecutablePath>..\..;$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
9897
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
9998
</PropertyGroup>
10099
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
101100
<GenerateManifest>false</GenerateManifest>
102101
<IgnoreImportLibrary>false</IgnoreImportLibrary>
103-
<ExecutablePath>..\..;$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
104102
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
105103
</PropertyGroup>
106104
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
107105
<GenerateManifest>false</GenerateManifest>
108106
<IgnoreImportLibrary>false</IgnoreImportLibrary>
109-
<ExecutablePath>..\..;$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
110107
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
111108
</PropertyGroup>
112109
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
113110
<GenerateManifest>false</GenerateManifest>
114111
<IgnoreImportLibrary>false</IgnoreImportLibrary>
115-
<ExecutablePath>..\..;$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
116112
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
117113
</PropertyGroup>
118114
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
119115
<GenerateManifest>false</GenerateManifest>
120116
<IgnoreImportLibrary>false</IgnoreImportLibrary>
121-
<ExecutablePath>..\..;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
122117
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
123118
</PropertyGroup>
124119
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
125120
<GenerateManifest>false</GenerateManifest>
126121
<IgnoreImportLibrary>false</IgnoreImportLibrary>
127-
<ExecutablePath>..\..;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
128122
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
129123
</PropertyGroup>
130124
<ItemDefinitionGroup>

‎test/old_tests/Composable/Composable.vcxproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,37 +94,31 @@
9494
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9595
<GenerateManifest>false</GenerateManifest>
9696
<IgnoreImportLibrary>false</IgnoreImportLibrary>
97-
<ExecutablePath>..\..;$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
9897
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
9998
</PropertyGroup>
10099
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
101100
<GenerateManifest>false</GenerateManifest>
102101
<IgnoreImportLibrary>false</IgnoreImportLibrary>
103-
<ExecutablePath>..\..;$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
104102
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
105103
</PropertyGroup>
106104
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
107105
<GenerateManifest>false</GenerateManifest>
108106
<IgnoreImportLibrary>false</IgnoreImportLibrary>
109-
<ExecutablePath>..\..;$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
110107
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
111108
</PropertyGroup>
112109
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
113110
<GenerateManifest>false</GenerateManifest>
114111
<IgnoreImportLibrary>false</IgnoreImportLibrary>
115-
<ExecutablePath>..\..;$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
116112
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
117113
</PropertyGroup>
118114
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
119115
<GenerateManifest>false</GenerateManifest>
120116
<IgnoreImportLibrary>false</IgnoreImportLibrary>
121-
<ExecutablePath>..\..;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
122117
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
123118
</PropertyGroup>
124119
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
125120
<GenerateManifest>false</GenerateManifest>
126121
<IgnoreImportLibrary>false</IgnoreImportLibrary>
127-
<ExecutablePath>..\..;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
128122
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
129123
</PropertyGroup>
130124
<ItemDefinitionGroup>

‎test/test_component/test_component.vcxproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,27 +92,21 @@
9292
<PropertyGroup Label="UserMacros" />
9393
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9494
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
95-
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
9695
</PropertyGroup>
9796
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
9897
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
99-
<ExecutablePath>$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
10098
</PropertyGroup>
10199
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
102100
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
103-
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
104101
</PropertyGroup>
105102
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
106103
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
107-
<ExecutablePath>$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
108104
</PropertyGroup>
109105
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
110106
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
111-
<ExecutablePath>$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
112107
</PropertyGroup>
113108
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
114109
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
115-
<ExecutablePath>$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
116110
</PropertyGroup>
117111
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
118112
<ClCompile>

‎test/test_component_base/test_component_base.vcxproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,27 +92,21 @@
9292
<PropertyGroup Label="UserMacros" />
9393
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9494
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
95-
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
9695
</PropertyGroup>
9796
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
9897
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
99-
<ExecutablePath>$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
10098
</PropertyGroup>
10199
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
102100
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
103-
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
104101
</PropertyGroup>
105102
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
106103
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
107-
<ExecutablePath>$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
108104
</PropertyGroup>
109105
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
110106
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
111-
<ExecutablePath>$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
112107
</PropertyGroup>
113108
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
114109
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
115-
<ExecutablePath>$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
116110
</PropertyGroup>
117111
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
118112
<ClCompile>

‎test/test_component_derived/test_component_derived.vcxproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,27 +92,21 @@
9292
<PropertyGroup Label="UserMacros" />
9393
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9494
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
95-
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
9695
</PropertyGroup>
9796
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
9897
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
99-
<ExecutablePath>$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
10098
</PropertyGroup>
10199
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
102100
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
103-
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
104101
</PropertyGroup>
105102
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
106103
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
107-
<ExecutablePath>$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
108104
</PropertyGroup>
109105
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
110106
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
111-
<ExecutablePath>$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
112107
</PropertyGroup>
113108
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
114109
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
115-
<ExecutablePath>$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
116110
</PropertyGroup>
117111
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
118112
<ClCompile>

‎test/test_component_fast/test_component_fast.vcxproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,27 +93,21 @@
9393
<PropertyGroup Label="UserMacros" />
9494
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9595
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
96-
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
9796
</PropertyGroup>
9897
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
9998
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
100-
<ExecutablePath>$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
10199
</PropertyGroup>
102100
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
103101
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
104-
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
105102
</PropertyGroup>
106103
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
107104
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
108-
<ExecutablePath>$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
109105
</PropertyGroup>
110106
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
111107
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
112-
<ExecutablePath>$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
113108
</PropertyGroup>
114109
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
115110
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
116-
<ExecutablePath>$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
117111
</PropertyGroup>
118112
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
119113
<ClCompile>

‎test/test_component_folders/test_component_folders.vcxproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,27 +92,21 @@
9292
<PropertyGroup Label="UserMacros" />
9393
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9494
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
95-
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
9695
</PropertyGroup>
9796
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
9897
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
99-
<ExecutablePath>$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
10098
</PropertyGroup>
10199
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
102100
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
103-
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
104101
</PropertyGroup>
105102
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
106103
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
107-
<ExecutablePath>$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
108104
</PropertyGroup>
109105
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
110106
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
111-
<ExecutablePath>$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
112107
</PropertyGroup>
113108
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
114109
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
115-
<ExecutablePath>$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
116110
</PropertyGroup>
117111
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
118112
<ClCompile>

‎test/test_component_no_pch/test_component_no_pch.vcxproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,27 +92,21 @@
9292
<PropertyGroup Label="UserMacros" />
9393
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9494
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
95-
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
9695
</PropertyGroup>
9796
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
9897
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
99-
<ExecutablePath>$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
10098
</PropertyGroup>
10199
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
102100
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
103-
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
104101
</PropertyGroup>
105102
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
106103
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
107-
<ExecutablePath>$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
108104
</PropertyGroup>
109105
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
110106
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
111-
<ExecutablePath>$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
112107
</PropertyGroup>
113108
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
114109
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
115-
<ExecutablePath>$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
116110
</PropertyGroup>
117111
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
118112
<ClCompile>

0 commit comments

Comments
 (0)