Merge branch 'saudi/fix-compiler-options-order-xcode' into 'main'

Fix compiler/linker compiler options order in xcode projects See merge request Sharpmake/sharpmake!553
ubisoft · Sep 12, 2024 · 675e07e · 675e07e
2 parents c7f5bb5 + 5680824
commit 675e07e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/Sharpmake.Generators/Apple/XCodeProj.cs b/Sharpmake.Generators/Apple/XCodeProj.cs
@@ -1492,6 +1492,7 @@ private Options.ExplicitOptions GenerateOptions(XCodeGenerationContext context)
  libFiles.AddRange(conf.DependenciesOtherLibraryFiles);
  libFiles.Sort();
 
+ conf.AdditionalLinkerOptions.Sort();
  var linkerOptions = new Strings(conf.AdditionalLinkerOptions);
 
  var linkObjC = Options.GetObject<Options.XCode.Linker.LinkObjC>(conf);
@@ -1542,6 +1543,8 @@ private Options.ExplicitOptions GenerateOptions(XCodeGenerationContext context)
  conf.Defines.Add("NDEBUG");
 
  options["PreprocessorDefinitions"] = XCodeUtil.XCodeFormatList(conf.Defines, 4, forceQuotes: true);
+ conf.AdditionalCompilerOptions.Sort();
+ conf.AdditionalCompilerOptimizeOptions.Sort();
  options["CompilerOptions"] = XCodeUtil.XCodeFormatList(Enumerable.Concat(conf.AdditionalCompilerOptions, conf.AdditionalCompilerOptimizeOptions), 4, forceQuotes: true);
  if (conf.AdditionalLibrarianOptions.Any())
  throw new NotImplementedException(nameof(conf.AdditionalLibrarianOptions) + " not supported with XCode generator");