Merge topic 'fbuild_dont_write_empty_deps'

64296789d3 FASTBuild: don't write empty dependencies

Acked-by: Kitware Robot <[email protected]>
Merge-request: !11208

Source/cmFastbuildNormalTargetGenerator.cxx

@@ -925,6 +925,18 @@ void cmFastbuildNormalTargetGenerator::Generate()
 
   AdditionalCleanFiles();
 
+  if (!fastbuildTarget.DependenciesAlias.PreBuildDependencies.empty()) {
+    for (FastbuildObjectListNode& objListNode :
+         fastbuildTarget.ObjectListNodes) {
+      objListNode.PreBuildDependencies.emplace(
+        fastbuildTarget.DependenciesAlias.Name);
+    }
+    for (auto& linkerNode : fastbuildTarget.LinkerNode) {
+      linkerNode.PreBuildDependencies.emplace(
+        fastbuildTarget.DependenciesAlias.Name);
+    }
+  }
+
   this->GetGlobalGenerator()->AddTarget(std::move(fastbuildTarget));
 }
 

Source/cmFastbuildTargetGenerator.cxx

@@ -762,8 +762,6 @@ void cmFastbuildTargetGenerator::AddObjectDependencies(
   };
 
   for (FastbuildObjectListNode& objList : fastbuildTarget.ObjectListNodes) {
-    objList.PreBuildDependencies.emplace(
-      fastbuildTarget.Name + FASTBUILD_DEPS_ARTIFACTS_ALIAS_POSTFIX);
     for (auto const& objDep : objList.ObjectDepends) {
       // Check if there is another object list which outputs (OBJECT_OUTPUTS)
       // something that this object list needs (OBJECT_DEPENDS).
@@ -787,9 +785,6 @@ void cmFastbuildTargetGenerator::AddLinkerNodeDependnecies(
   FastbuildTarget& fastbuildTarget)
 {
   for (auto& linkerNode : fastbuildTarget.LinkerNode) {
-    linkerNode.PreBuildDependencies.emplace(
-      fastbuildTarget.Name + FASTBUILD_DEPS_ARTIFACTS_ALIAS_POSTFIX);
-
     if (!fastbuildTarget.PreLinkExecNodes.Nodes.empty()) {
       linkerNode.PreBuildDependencies.emplace(
         fastbuildTarget.Name + FASTBUILD_PRE_LINK_ALIAS_POSTFIX);