summaryrefslogtreecommitdiffstats
path: root/Source/cmNinjaTargetGenerator.cxx
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2019-02-20 18:20:28 (GMT)
committerBrad King <brad.king@kitware.com>2019-02-25 15:14:11 (GMT)
commitf22c18b1c1554b573c684efcb5c921c17c9b0f1d (patch)
treef046817a3db0b6b263667b4ea013956ddb9925f9 /Source/cmNinjaTargetGenerator.cxx
parent7c78adca8e0285c198e03163c2bb722cd86b389d (diff)
downloadCMake-f22c18b1c1554b573c684efcb5c921c17c9b0f1d.zip
CMake-f22c18b1c1554b573c684efcb5c921c17c9b0f1d.tar.gz
CMake-f22c18b1c1554b573c684efcb5c921c17c9b0f1d.tar.bz2
ninja: name dyndep internal files using the object file
Now that preprocessing outputs are not necessarily used all the way through, the output name is a better base name to use for these files.
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
-rw-r--r--Source/cmNinjaTargetGenerator.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 6e140fb..8d11408 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -1113,7 +1113,7 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
// Explicit preprocessing always uses a depfile.
ppVars["DEP_FILE"] = this->GetLocalGenerator()->ConvertToOutputFormat(
- ppFileName + ".d", cmOutputConverter::SHELL);
+ objectFileName + ".d", cmOutputConverter::SHELL);
if (compilePP) {
// The actual compilation does not need a depfile because it
// depends on the already-preprocessed source.
@@ -1126,7 +1126,7 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
ppVars["OBJ_FILE"] = objectFileName;
// Tell dependency scanner where to store dyndep intermediate results.
- std::string const ddiFile = ppFileName + ".ddi";
+ std::string const ddiFile = objectFileName + ".ddi";
ppVars["DYNDEP_INTERMEDIATE_FILE"] = ddiFile;
ppImplicitOuts.push_back(ddiFile);
this->DDIFiles[language].push_back(ddiFile);