Revert "[Bff] Move the build only dependencies to the target alias in…

…stead of the prebuild of the node that outputs." This can create issues with executables finishing to link before their dependencies, especially with postbuild steps like unit-tests. This reverts commit a184e66.
ubisoft · Oct 5, 2021 · 9ec1d18 · 9ec1d18
1 parent e49edea
commit 9ec1d18
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/Sharpmake.Generators/FastBuild/Bff.cs b/Sharpmake.Generators/FastBuild/Bff.cs
@@ -416,17 +416,18 @@ List<string> skipFiles
                                 if (isExport)
                                     continue;
 
-                                string shortProjectName = GetShortProjectName(depProjConfig.Project, depProjConfig);
-
                                 if (depProjConfig.Output != Project.Configuration.OutputType.Exe &&
                                     depProjConfig.Output != Project.Configuration.OutputType.Utility)
                                 {
+                                    string shortProjectName = GetShortProjectName(depProjConfig.Project, depProjConfig);
                                     if (!dependenciesInfo.IgnoredLibraryNames.Contains(depProjConfig.TargetFileFullNameWithExtension))
                                         fastBuildProjectDependencies.Add(shortProjectName + "_LibraryDependency");
+                                    fastBuildBuildOnlyDependencies.Add(shortProjectName);
+                                }
+                                else if (!depProjConfig.IsExcludedFromBuild)
+                                {
+                                    fastBuildProjectExeUtilityDependencyList.Add(GetShortProjectName(depProjConfig.Project, depProjConfig));
                                 }
-
-                                if (!depProjConfig.IsExcludedFromBuild)
-                                    fastBuildProjectExeUtilityDependencyList.Add(shortProjectName);
                             }
 
                             orderedProjectDeps = UtilityMethods.GetOrderedFlattenedBuildOnlyDependencies(conf);
@@ -439,8 +440,15 @@ List<string> skipFiles
                                 if (isExport)
                                     continue;
 
-                                string shortProjectName = GetShortProjectName(depProjConfig.Project, depProjConfig);
-                                fastBuildProjectExeUtilityDependencyList.Add(shortProjectName);
+                                if (depProjConfig.Output != Project.Configuration.OutputType.Exe &&
+                                    depProjConfig.Output != Project.Configuration.OutputType.Utility)
+                                {
+                                    fastBuildBuildOnlyDependencies.Add(GetShortProjectName(depProjConfig.Project, depProjConfig));
+                                }
+                                else
+                                {
+                                    fastBuildProjectExeUtilityDependencyList.Add(GetShortProjectName(depProjConfig.Project, depProjConfig));
+                                }
                             }
                         }