diff --git a/Source/cmFastbuildNormalTargetGenerator.cxx b/Source/cmFastbuildNormalTargetGenerator.cxx index a067569fa8..63b00928a8 100644 --- a/Source/cmFastbuildNormalTargetGenerator.cxx +++ b/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) { diff --git a/Source/cmFastbuildNormalTargetGenerator.h b/Source/cmFastbuildNormalTargetGenerator.h index d14c7058b4..2902758eae 100644 --- a/Source/cmFastbuildNormalTargetGenerator.h +++ b/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); diff --git a/Tests/RunCMake/LinkWarningAsError/WarnError.cmake b/Tests/RunCMake/LinkWarningAsError/WarnError.cmake index 91d3d68cf7..6e336ddf61 100644 --- a/Tests/RunCMake/LinkWarningAsError/WarnError.cmake +++ b/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()