Additional Flags for CustomFileBuildStepData (#322)

* Additional flag for CustomFileBuildStep This adds one new flag: - UseExecutableFromSystemPath: This will skip resolve of the executable and will not add the executable to AdditionalInputs. This should be used only if your executable is on system path. --------- Co-authored-by: Sharlock93 <[email protected]>
ubisoft · Feb 2, 2024 · 0f38fe2 · 0f38fe2
1 parent 8f9a027
commit 0f38fe2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/Sharpmake.Generators/VisualStudio/Vcxproj.cs b/Sharpmake.Generators/VisualStudio/Vcxproj.cs
@@ -174,7 +174,10 @@ public static Dictionary<string, CombinedCustomFileBuildStep> CombineCustomFileB
             foreach (var customBuildStep in buildSteps)
             {
                 var relativeBuildStep = customBuildStep.MakePathRelative(resolver, (path, commandRelative) => Util.SimplifyPath(Util.PathGetRelative(referencePath, path)));
-                relativeBuildStep.AdditionalInputs.Add(relativeBuildStep.Executable);
+                if(!customBuildStep.UseExecutableFromSystemPath)
+                {
+                    relativeBuildStep.AdditionalInputs.Add(relativeBuildStep.Executable);
+                }
                 // Build the command.
                 string command = string.Format(
                     "\"{0}\" {1}",

diff --git a/Sharpmake/Project.Configuration.cs b/Sharpmake/Project.Configuration.cs
@@ -2199,6 +2199,10 @@ public enum ProjectFilter
                 /// </summary>
                 public string Executable = "";
                 /// <summary>
+                /// Use this to indicate the executable is in the system Path
+                /// </summary>
+                public bool UseExecutableFromSystemPath = false;
+                /// <summary>
                 /// These are the arguments to pass to the executable.
                 /// </summary>
                 /// <remarks>
@@ -2808,7 +2812,12 @@ internal void Resolve(Resolver resolver)
                 {
                     customFileBuildStep.Resolve(resolver);
                     Util.ResolvePath(Project.SourceRootPath, ref customFileBuildStep.KeyInput);
-                    Util.ResolvePath(Project.SourceRootPath, ref customFileBuildStep.Executable);
+
+                    if(!customFileBuildStep.UseExecutableFromSystemPath)
+                    {
+                        Util.ResolvePath(Project.SourceRootPath, ref customFileBuildStep.Executable);
+                    }
+
                     Util.ResolvePath(Project.SourceRootPath, ref customFileBuildStep.Output);
                     Util.ResolvePath(Project.SourceRootPath, ref customFileBuildStep.AdditionalInputs);
                 }