diff options
| author | Bruno Manganelli <bruno.manga95@gmail.com> | 2018-11-22 21:05:05 (GMT) |
|---|---|---|
| committer | Bruno Manganelli <bruno.manga95@gmail.com> | 2019-01-21 15:34:16 (GMT) |
| commit | 3e867ed4003e33ace2de6027f9bedb9aa7718b0c (patch) | |
| tree | 9fe1b65a8b7e96c9a964761089dd1d48d5385937 /Source/cmNinjaNormalTargetGenerator.cxx | |
| parent | c144db1b8ca1ea2e3dad397123f110956a439030 (diff) | |
| download | CMake-3e867ed4003e33ace2de6027f9bedb9aa7718b0c.zip CMake-3e867ed4003e33ace2de6027f9bedb9aa7718b0c.tar.gz CMake-3e867ed4003e33ace2de6027f9bedb9aa7718b0c.tar.bz2 | |
cmake: inlined files dir constant and removed it from cmake.h
Diffstat (limited to 'Source/cmNinjaNormalTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index b62da66..8b125e3 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -31,7 +31,6 @@ #include "cmStateSnapshot.h" #include "cmStateTypes.h" #include "cmSystemTools.h" -#include "cmake.h" class cmCustomCommand; @@ -718,8 +717,7 @@ void cmNinjaNormalTargetGenerator::WriteDeviceLinkStatement() globalGen.GetRuleCmdLength(this->LanguageLinkerDeviceRule()); const std::string rspfile = this->ConvertToNinjaPath( - std::string(cmake::GetCMakeFilesDirectoryPostSlash()) + - genTarget.GetName() + ".rsp"); + std::string("CMakeFiles/") + genTarget.GetName() + ".rsp"); // Gather order-only dependencies. cmNinjaDeps orderOnlyDeps; @@ -1004,8 +1002,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement() } const std::string rspfile = this->ConvertToNinjaPath( - std::string(cmake::GetCMakeFilesDirectoryPostSlash()) + gt.GetName() + - ".rsp"); + std::string("CMakeFiles/") + gt.GetName() + ".rsp"); // Gather order-only dependencies. cmNinjaDeps orderOnlyDeps; |