Skip to content

Commit 79eb574

Browse files
DefaultRyanCopilot
andcommitted
Better automation of AdditionalBMIDirectories
Co-authored-by: Copilot <copilot@github.com>
1 parent 4d91f75 commit 79eb574

4 files changed

Lines changed: 14 additions & 3 deletions

File tree

nuget/Microsoft.Windows.CppWinRT.targets

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -973,6 +973,17 @@ $(XamlMetaDataProviderPch)
973973

974974
<Message Text="C++/WinRT: Module providers: @(_CppWinRTModuleProviders)" Importance="$(CppWinRTVerbosity)" />
975975
<Message Text="C++/WinRT: Resolved module IfcDir: @(_CppWinRTResolvedModuleRefs->'%(CppWinRTModuleIfcDir)')" Importance="$(CppWinRTVerbosity)" />
976+
977+
<!-- Wire resolved IFC directories into AdditionalBMIDirectories so the
978+
compiler can find pre-built module interfaces via /ifcSearchDir -->
979+
<PropertyGroup Condition="'@(_CppWinRTResolvedModuleRefs)' != ''">
980+
<_CppWinRTModuleIfcSearchDirs>@(_CppWinRTResolvedModuleRefs->'%(CppWinRTModuleIfcDir)')</_CppWinRTModuleIfcSearchDirs>
981+
</PropertyGroup>
982+
<ItemGroup Condition="'$(_CppWinRTModuleIfcSearchDirs)' != ''">
983+
<ClCompile>
984+
<AdditionalBMIDirectories>$(_CppWinRTModuleIfcSearchDirs);%(ClCompile.AdditionalBMIDirectories)</AdditionalBMIDirectories>
985+
</ClCompile>
986+
</ItemGroup>
976987
</Target>
977988

978989
</Project>

test/nuget/TestModuleComponent1/TestModuleComponent1.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<LanguageStandard>stdcpplatest</LanguageStandard>
4343
<WarningLevel>Level4</WarningLevel>
4444
<TreatWarningAsError>true</TreatWarningAsError>
45-
<AdditionalOptions>%(AdditionalOptions) /bigobj /ifcSearchDir "$(IntDirRoot)$(Configuration)\$(PlatformDirectoryName)\TestModuleBuilder"</AdditionalOptions>
45+
<AdditionalOptions>%(AdditionalOptions) /bigobj</AdditionalOptions>
4646
<BuildStlModules>true</BuildStlModules>
4747
<PreprocessorDefinitions>_WINRT_DLL;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
4848
<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>

test/nuget/TestModuleComponent2/TestModuleComponent2.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<LanguageStandard>stdcpplatest</LanguageStandard>
4343
<WarningLevel>Level4</WarningLevel>
4444
<TreatWarningAsError>true</TreatWarningAsError>
45-
<AdditionalOptions>%(AdditionalOptions) /bigobj /ifcSearchDir "$(IntDirRoot)$(Configuration)\$(PlatformDirectoryName)\TestModuleBuilder"</AdditionalOptions>
45+
<AdditionalOptions>%(AdditionalOptions) /bigobj</AdditionalOptions>
4646
<BuildStlModules>true</BuildStlModules>
4747
<PreprocessorDefinitions>_WINRT_DLL;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
4848
<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>

test/nuget/TestModuleConsumerApp/TestModuleConsumerApp.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<LanguageStandard>stdcpplatest</LanguageStandard>
4040
<WarningLevel>Level4</WarningLevel>
4141
<TreatWarningAsError>true</TreatWarningAsError>
42-
<AdditionalOptions>%(AdditionalOptions) /bigobj /ifcSearchDir "$(IntDirRoot)$(Configuration)\$(PlatformDirectoryName)\TestModuleBuilder"</AdditionalOptions>
42+
<AdditionalOptions>%(AdditionalOptions) /bigobj</AdditionalOptions>
4343
<BuildStlModules>true</BuildStlModules>
4444
<PreprocessorDefinitions>NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
4545
</ClCompile>

0 commit comments

Comments
 (0)