diff --git a/Sharpmake.Generators/Apple/XCodeProj.Template.cs b/Sharpmake.Generators/Apple/XCodeProj.Template.cs
index f34b72162..99ecb9586 100644
--- a/Sharpmake.Generators/Apple/XCodeProj.Template.cs
+++ b/Sharpmake.Generators/Apple/XCodeProj.Template.cs
@@ -481,6 +481,21 @@ private static class Template
 "               }
             };
 
+            public static string CommandLineArgumentsBegin =
+@"
+      <CommandLineArguments>";
+
+            public static string CommandLineArgument =
+@"
+         <CommandLineArgument
+            argument = ""[argument]""
+            isEnabled = ""YES"">
+         </CommandLineArgument>";
+
+            public static string CommandLineArgumentsEnd =
+@"
+      </CommandLineArguments>";
+
             public static string SchemeTestableReference =
 @"
          <TestableReference
@@ -546,7 +561,7 @@ private static class Template
               BlueprintName = ""[item.Identifier]""
               ReferencedContainer = ""container:[projectFile].xcodeproj"">
           </BuildableReference>
-      </BuildableProductRunnable>
+      </BuildableProductRunnable>[commandLineArguments]
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
diff --git a/Sharpmake.Generators/Apple/XCodeProj.cs b/Sharpmake.Generators/Apple/XCodeProj.cs
index a13a7db66..0203267e8 100644
--- a/Sharpmake.Generators/Apple/XCodeProj.cs
+++ b/Sharpmake.Generators/Apple/XCodeProj.cs
@@ -270,6 +270,20 @@ string projectFile
                 }
             }
 
+            // Build commandLineArguments
+            var debugArguments = Options.GetObject<Options.XCode.Scheme.DebugArguments>(configurations[0]);
+            var commandLineArguments = new StringBuilder();
+            if (debugArguments != null)
+            {
+                commandLineArguments.Append(Template.CommandLineArgumentsBegin);
+                foreach(var argument in debugArguments)
+                {
+                    using (fileGenerator.Declare("argument", argument))
+                    commandLineArguments.Append(fileGenerator.Resolver.Resolve(Template.CommandLineArgument));
+                }
+                commandLineArguments.Append(Template.CommandLineArgumentsEnd);
+            }
+
             // Write the scheme file
             var defaultTarget = _nativeOrLegacyTargets.Values.Where(target => target.OutputFile.OutputType != Project.Configuration.OutputType.IosTestBundle).FirstOrDefault();
 
@@ -296,6 +310,7 @@ string projectFile
             using (fileGenerator.Declare("options", options))
             using (fileGenerator.Declare("testableElements", testableElements))
             using (fileGenerator.Declare("DefaultTarget", targetName))
+            using (fileGenerator.Declare("commandLineArguments", commandLineArguments))
             {
                 fileGenerator.Write(Template.SchemeFileTemplate);
             }
diff --git a/Sharpmake/Options.XCode.cs b/Sharpmake/Options.XCode.cs
index 07d17467b..a515283f6 100644
--- a/Sharpmake/Options.XCode.cs
+++ b/Sharpmake/Options.XCode.cs
@@ -1148,6 +1148,18 @@ public enum MetalAPIValidation
                     Enable,
                     Disable
                 }              
+
+                /// <summary>
+                /// Resolve to <CommandLineArguments> in xcscheme, 
+                ///  for configuring 'Arguments Passed On Launch' as 'Edit Scheme' in XCode can do
+                /// </summary>
+                public class DebugArguments: List<string>
+                {
+                    public DebugArguments(List<string> args)
+                        : base(args) 
+                    {
+                    }
+                }
             }
         }
     }