diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2019-02-20 09:57:07 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-02-25 15:14:09 (GMT) |
| commit | 2c0a7bc770367e80ce1fc68ea6cb9c9543e854e4 (patch) | |
| tree | 670ba9cd0a90566e8fbca03a49eb38faa6747d17 /Source/cmNinjaTargetGenerator.cxx | |
| parent | 72f9bb29939f3765216e98e672197b3899d75f7d (diff) | |
| download | CMake-2c0a7bc770367e80ce1fc68ea6cb9c9543e854e4.zip CMake-2c0a7bc770367e80ce1fc68ea6cb9c9543e854e4.tar.gz CMake-2c0a7bc770367e80ce1fc68ea6cb9c9543e854e4.tar.bz2 | |
ninja: pass language to cmake_ninja_depends
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 6a08d5c..28d4a07 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -558,7 +558,7 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang) cmake + " -E cmake_ninja_depends" " --tdi=" + - tdi + + tdi + " --lang=" + lang + " --pp=$out" " --dep=$DEP_FILE" + (needDyndep ? " --obj=$OBJ_FILE --ddi=$DYNDEP_INTERMEDIATE_FILE" : "")); @@ -1062,8 +1062,8 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement( // In case compilation requires flags that are incompatible with // preprocessing, include them here. - std::string const postFlag = - this->Makefile->GetSafeDefinition("CMAKE_Fortran_POSTPROCESS_FLAG"); + std::string const postFlag = this->Makefile->GetSafeDefinition( + "CMAKE_" + language + "_POSTPROCESS_FLAG"); this->LocalGenerator->AppendFlags(vars["FLAGS"], postFlag); // Move preprocessor definitions to the preprocessor build statement. |