Merge topic 'fbuild_fix_rules'

2db39a59b5 FASTBuild: fix inconsistencies in rules application

Acked-by: Kitware Robot <[email protected]>
Reviewed-by: Vito Gamberini <[email protected]>
Merge-request: !11133

Source/cmFastbuildNormalTargetGenerator.cxx

@@ -332,7 +332,7 @@ bool cmFastbuildNormalTargetGenerator::DetectBaseLinkerCommand(
   return true;
 }
 
-void cmFastbuildNormalTargetGenerator::ApplyCompileRuleLauncher(
+void cmFastbuildNormalTargetGenerator::ApplyLinkRuleLauncher(
   std::string& command)
 {
   std::string const val = this->GetLocalGenerator()->GetRuleLauncher(
@@ -343,17 +343,6 @@ void cmFastbuildNormalTargetGenerator::ApplyCompileRuleLauncher(
   }
 }
 
-void cmFastbuildNormalTargetGenerator::ApplyLinkRuleLauncher(
-  std::string& command)
-{
-  std::string const val = this->GetLocalGenerator()->GetRuleLauncher(
-    this->GetGeneratorTarget(), "RULE_LAUNCH_COMPILE", Config);
-  if (cmNonempty(val)) {
-    LogMessage("RULE_LAUNCH_COMPILE: " + val);
-    command = cmStrCat(val, " ", command);
-  }
-}
-
 void cmFastbuildNormalTargetGenerator::ApplyLWYUToLinkerCommand(
   FastbuildLinkerNode& linkerNode)
 {

Source/cmFastbuildNormalTargetGenerator.h

@@ -126,7 +126,6 @@ private:
                                   std::string& outLinkerExecutable,
                                   std::string& outLinkerArgs);
 
-  void ApplyCompileRuleLauncher(std::string& command);
   void ApplyLinkRuleLauncher(std::string& command);
   void ApplyLWYUToLinkerCommand(FastbuildLinkerNode& linkerNode);
 

Tests/RunCMake/LinkWarningAsError/WarnError.cmake

@@ -29,6 +29,10 @@ else()
   string(REPLACE "${CMAKE_END_TEMP_FILE}" "" CMAKE_C_LINK_EXECUTABLE "${CMAKE_C_LINK_EXECUTABLE}")
 
   add_executable(main main.c)
+  if(CMAKE_GENERATOR MATCHES "FASTBuild")
+    # FASTBuild needs output to exist.
+    file(TOUCH "${CMAKE_CURRENT_BINARY_DIR}${cfg_dir}/main${CMAKE_EXECUTABLE_SUFFIX}")
+  endif()
   if (NOT DEFINED CMAKE_LINK_WARNING_AS_ERROR)
     set_property(TARGET main PROPERTY LINK_WARNING_AS_ERROR ${link_warning_as_error})
   endif()