Skip to content

Commit 8aeffb6

Browse files
authored
fix incremental build of tests/old_tests/composable, OutputPath -> OutDir (#775)
1 parent 47aef80 commit 8aeffb6

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

test/old_tests/Composable/Composable.vcxproj

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,10 @@
171171
</PropertyGroup>
172172
<ItemDefinitionGroup>
173173
<CustomBuildStep>
174-
<Command>$(OutputPath)cppwinrt.exe -in $(OutputPath)Composable.winmd -comp $(ProjectDir) -out "$(ProjectDir)Generated Files" -ref sdk -verbose -pch precomp.hpp -name Composable</Command>
174+
<Command>$(OutDir)cppwinrt.exe -in $(OutDir)Composable.winmd -comp $(ProjectDir) -out "$(ProjectDir)Generated Files" -ref sdk -verbose -pch precomp.hpp -name Composable</Command>
175175
<Message>C++/WinRT compiler</Message>
176176
<Outputs>Generated Files\module.g.cpp</Outputs>
177-
<Inputs>$(OutputDir)Composable.winmd</Inputs>
177+
<Inputs>$(OutDir)Composable.winmd</Inputs>
178178
</CustomBuildStep>
179179
<ClCompile />
180180
<ClCompile />
@@ -184,7 +184,7 @@
184184
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
185185
<ClCompile>
186186
<CompileAsWinRT>false</CompileAsWinRT>
187-
<AdditionalIncludeDirectories>$(ProjectDir);$(OutputPath);Generated Files</AdditionalIncludeDirectories>
187+
<AdditionalIncludeDirectories>$(ProjectDir);$(OutDir);Generated Files</AdditionalIncludeDirectories>
188188
<MinimalRebuild>false</MinimalRebuild>
189189
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
190190
<PreprocessorDefinitions>NOMINMAX;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -218,7 +218,7 @@
218218
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
219219
<ClCompile>
220220
<CompileAsWinRT>false</CompileAsWinRT>
221-
<AdditionalIncludeDirectories>$(ProjectDir);$(OutputPath);Generated Files</AdditionalIncludeDirectories>
221+
<AdditionalIncludeDirectories>$(ProjectDir);$(OutDir);Generated Files</AdditionalIncludeDirectories>
222222
<MinimalRebuild>false</MinimalRebuild>
223223
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
224224
<PreprocessorDefinitions>NOMINMAX;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -254,7 +254,7 @@
254254
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
255255
<ClCompile>
256256
<CompileAsWinRT>false</CompileAsWinRT>
257-
<AdditionalIncludeDirectories>$(ProjectDir);$(OutputPath);Generated Files</AdditionalIncludeDirectories>
257+
<AdditionalIncludeDirectories>$(ProjectDir);$(OutDir);Generated Files</AdditionalIncludeDirectories>
258258
<MinimalRebuild>false</MinimalRebuild>
259259
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
260260
<PreprocessorDefinitions>NOMINMAX;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -290,7 +290,7 @@
290290
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
291291
<ClCompile>
292292
<CompileAsWinRT>false</CompileAsWinRT>
293-
<AdditionalIncludeDirectories>$(ProjectDir);$(OutputPath);Generated Files</AdditionalIncludeDirectories>
293+
<AdditionalIncludeDirectories>$(ProjectDir);$(OutDir);Generated Files</AdditionalIncludeDirectories>
294294
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
295295
<PreprocessorDefinitions>NOMINMAX;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
296296
<DisableSpecificWarnings>4100;4297;4458</DisableSpecificWarnings>
@@ -323,7 +323,7 @@
323323
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
324324
<ClCompile>
325325
<CompileAsWinRT>false</CompileAsWinRT>
326-
<AdditionalIncludeDirectories>$(ProjectDir);$(OutputPath);Generated Files</AdditionalIncludeDirectories>
326+
<AdditionalIncludeDirectories>$(ProjectDir);$(OutDir);Generated Files</AdditionalIncludeDirectories>
327327
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
328328
<PreprocessorDefinitions>NOMINMAX;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
329329
<DisableSpecificWarnings>4100;4297;4458</DisableSpecificWarnings>
@@ -358,7 +358,7 @@
358358
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
359359
<ClCompile>
360360
<CompileAsWinRT>false</CompileAsWinRT>
361-
<AdditionalIncludeDirectories>$(ProjectDir);$(OutputPath);Generated Files</AdditionalIncludeDirectories>
361+
<AdditionalIncludeDirectories>$(ProjectDir);$(OutDir);Generated Files</AdditionalIncludeDirectories>
362362
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
363363
<PreprocessorDefinitions>NOMINMAX;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
364364
<DisableSpecificWarnings>4100;4297;4458</DisableSpecificWarnings>
@@ -393,7 +393,7 @@
393393
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
394394
<ClCompile>
395395
<CompileAsWinRT>false</CompileAsWinRT>
396-
<AdditionalIncludeDirectories>$(ProjectDir);$(OutputPath);Generated Files</AdditionalIncludeDirectories>
396+
<AdditionalIncludeDirectories>$(ProjectDir);$(OutDir);Generated Files</AdditionalIncludeDirectories>
397397
<MinimalRebuild>false</MinimalRebuild>
398398
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
399399
<PreprocessorDefinitions>NOMINMAX;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -427,7 +427,7 @@
427427
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
428428
<ClCompile>
429429
<CompileAsWinRT>false</CompileAsWinRT>
430-
<AdditionalIncludeDirectories>$(ProjectDir);$(OutputPath);Generated Files</AdditionalIncludeDirectories>
430+
<AdditionalIncludeDirectories>$(ProjectDir);$(OutDir);Generated Files</AdditionalIncludeDirectories>
431431
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
432432
<PreprocessorDefinitions>NOMINMAX;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
433433
<DisableSpecificWarnings>4100;4297;4458</DisableSpecificWarnings>
@@ -461,8 +461,6 @@
461461
<ClInclude Include="Base.h" />
462462
<ClInclude Include="Derived.h" />
463463
<ClInclude Include="precomp.hpp" />
464-
</ItemGroup>
465-
<ItemGroup>
466464
<ClCompile Include="Base.cpp" />
467465
<ClCompile Include="Derived.cpp" />
468466
<ClCompile Include="Generated Files\module.g.cpp" />

0 commit comments

Comments
 (0)