diff options
| author | Brad King <brad.king@kitware.com> | 2017-07-13 11:43:22 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-07-13 11:45:11 (GMT) |
| commit | 37915a69304d0de36e15b024380a7ddabeb0d821 (patch) | |
| tree | 120ba7494aaf4e0f2a1de4a7d59ad94c1fb56a98 | |
| parent | e5c762d32d8a1329aac66a66eaf634a009cb288b (diff) | |
| parent | 4ef0eedb496cd60a9fa9c9f51e02e167c8a1e64a (diff) | |
| download | CMake-37915a69304d0de36e15b024380a7ddabeb0d821.zip CMake-37915a69304d0de36e15b024380a7ddabeb0d821.tar.gz CMake-37915a69304d0de36e15b024380a7ddabeb0d821.tar.bz2 | |
Merge topic 'ninja-dyndep-response-file'
4ef0eedb Ninja: always use response file for cmake_ninja_dyndep
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1038
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 7c57ef0..79191ec 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -557,17 +557,11 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang) // Write the rule for ninja dyndep file generation. std::vector<std::string> ddCmds; -#ifdef _WIN32 - // Windows command line length is limited -> use response file for dyndep - // rules + // Command line length is almost always limited -> use response file for + // dyndep rules std::string ddRspFile = "$out.rsp"; std::string ddRspContent = "$in"; std::string ddInput = "@" + ddRspFile; -#else - std::string ddRspFile; - std::string ddRspContent; - std::string ddInput = "$in"; -#endif // Run CMake dependency scanner on preprocessed output. std::string const cmake = this->GetLocalGenerator()->ConvertToOutputFormat( |