From 88365838b843ec4452d1f282b5ce23b2b3d6590d Mon Sep 17 00:00:00 2001 From: Matthijs Kool Date: Tue, 5 Jun 2018 15:21:49 +0200 Subject: Ninja: Use native slashes to pass rsp files Some tools on Windows (e.g. Embarcadero linkers) can't handle forward slashes in paths to rsp files. --- Source/cmNinjaNormalTargetGenerator.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index a4d3e06..7394188 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -719,9 +719,9 @@ void cmNinjaNormalTargetGenerator::WriteDeviceLinkStatement() static_cast(cmSystemTools::CalculateCommandLineLengthLimit()) - globalGen.GetRuleCmdLength(this->LanguageLinkerDeviceRule()); - const std::string rspfile = + const std::string rspfile = this->ConvertToNinjaPath( std::string(cmake::GetCMakeFilesDirectoryPostSlash()) + - genTarget.GetName() + ".rsp"; + genTarget.GetName() + ".rsp"); // Gather order-only dependencies. cmNinjaDeps orderOnlyDeps; @@ -1005,9 +1005,9 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement() globalGen.GetRuleCmdLength(this->LanguageLinkerRule()); } - const std::string rspfile = + const std::string rspfile = this->ConvertToNinjaPath( std::string(cmake::GetCMakeFilesDirectoryPostSlash()) + gt.GetName() + - ".rsp"; + ".rsp"); // Gather order-only dependencies. cmNinjaDeps orderOnlyDeps; -- cgit v0.12