Add new TranslateIncludes option in Options.Vc for vs2019+

ubisoft · Aug 13, 2021 · 506aa1d · 506aa1d
1 parent e1999e8
commit 506aa1d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/Sharpmake.Generators/FastBuild/Bff.Template.cs b/Sharpmake.Generators/FastBuild/Bff.Template.cs
@@ -411,6 +411,7 @@ public static class ConfigurationFile
             + ' /errorReport:queue'
             // Character Set
             // ---------------------------
+            + ' [cmdLineOptions.TranslateIncludes]'
             + ' [cmdLineOptions.CharacterSet]'
             // Additional compiler options
             //--------------------------

diff --git a/Sharpmake.Generators/VisualStudio/ProjectOptionsGenerator.cs b/Sharpmake.Generators/VisualStudio/ProjectOptionsGenerator.cs
@@ -498,6 +498,11 @@ private void GenerateCompilerOptions(IGenerationContext context, ProjectOptionsG
             Options.Option(Options.Vc.General.DiagnosticsFormat.ColumnInfo, () => { context.Options["DiagnosticsFormat"] = "Column"; context.CommandLineOptions["DiagnosticsFormat"] = "/diagnostics:column"; })
             );
 
+            context.SelectOption
+            (
+            Options.Option(Options.Vc.General.TreatAngleIncludeAsExternal.Enable, () => { context.Options["TreatAngleIncludeAsExternal"] = "true"; context.CommandLineOptions["TreatAngleIncludeAsExternal"] = "/external:anglebrackets"; }),
+            Options.Option(Options.Vc.General.TreatAngleIncludeAsExternal.Disable, () => { context.Options["TreatAngleIncludeAsExternal"] = FileGeneratorUtilities.RemoveLineTag; context.CommandLineOptions["TreatAngleIncludeAsExternal"] = FileGeneratorUtilities.RemoveLineTag; })
+            );
 
             context.Options["TrackFileAccess"] = FileGeneratorUtilities.RemoveLineTag;
 

diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/BasePlatform.Vcxproj.Template.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/BasePlatform.Vcxproj.Template.cs
@@ -175,6 +175,7 @@ public abstract partial class BasePlatform
     <ConfigurationType>[options.ConfigurationType]</ConfigurationType>
     <UseDebugLibraries>[options.UseDebugLibraries]</UseDebugLibraries>
     <PreferredToolArchitecture>[options.PreferredToolArchitecture]</PreferredToolArchitecture>
+    <TranslateIncludes>[options.TranslateIncludes]</TranslateIncludes>
     <CharacterSet>[options.CharacterSet]</CharacterSet>
     <UseOfMfc>[options.UseOfMfc]</UseOfMfc>
     <CLRSupport>[clrSupport]</CLRSupport>

diff --git a/Sharpmake/Options.Vc.cs b/Sharpmake/Options.Vc.cs
@@ -87,6 +87,19 @@ public enum WindowsTargetPlatformVersion
                     Latest,        // latest available in host machine
                 }
 
+                /// <summary>
+                /// Translate Includes to Imports
+                /// </summary>
+                /// <remarks>
+                /// Enables the compiler to translate #include directives into import directives for the available header units.  (/translateInclude)
+                /// </remarks>
+                public enum TranslateIncludes
+                {
+                    Enable,
+                    [Default]
+                    Disable
+                }
+
                 /// <summary>
                 /// Character Set
                 /// </summary>