[Custom Build Steps] Fixes to get custom build steps working.

* Add quotes to executable to support spaces in paths since the quotes can't be added by the user. * Standardize the path when looking up the build step since it may be lower cased.
ubisoft · Feb 10, 2022 · 72046c0 · 72046c0
1 parent a0c127e
commit 72046c0
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Sharpmake.Generators/VisualStudio/Vcxproj.cs b/Sharpmake.Generators/VisualStudio/Vcxproj.cs
@@ -181,7 +181,7 @@ public static Dictionary<string, CombinedCustomFileBuildStep> CombineCustomFileB
                 relativeBuildStep.AdditionalInputs.Add(relativeBuildStep.Executable);
                 // Build the command.
                 string command = string.Format(
-                    "{0} {1}",
+                    @"""{0}"" {1}",
                     relativeBuildStep.Executable,
                     relativeBuildStep.ExecutableArguments
                 );
@@ -1430,10 +1430,12 @@ IList<string> skipFiles
                     {
                         fileGenerator.Write(Template.Project.ProjectFilesCustomBuildBegin);
 
+                        var standardPath = Util.PathMakeStandard(file.FileNameProjectRelative);
+
                         foreach (Project.Configuration conf in context.ProjectConfigurations)
                         {
                             CombinedCustomFileBuildStep buildStep;
-                            if (configurationCustomFileBuildSteps[conf].TryGetValue(file.FileNameProjectRelative, out buildStep))
+                            if (configurationCustomFileBuildSteps[conf].TryGetValue(standardPath, out buildStep))
                             {
                                 using (fileGenerator.Declare("conf", conf))
                                 using (fileGenerator.Declare("platformName", Util.GetPlatformString(conf.Platform, conf.Project, conf.Target)))