diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-21 12:51:42 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-04-21 12:51:49 (GMT) |
| commit | 718daeb4e6b93527ea8fa0b87091008737b0a897 (patch) | |
| tree | 954f79f4e7808943a0954add77a80ea1eec1a316 /Source/cmGlobalNinjaGenerator.cxx | |
| parent | b5a5b227f9a3d88e1c493427e3983aee28c284eb (diff) | |
| parent | bbb5c3efe2a17d046506b7c27008c77ea244f0bc (diff) | |
| download | CMake-718daeb4e6b93527ea8fa0b87091008737b0a897.zip CMake-718daeb4e6b93527ea8fa0b87091008737b0a897.tar.gz CMake-718daeb4e6b93527ea8fa0b87091008737b0a897.tar.bz2 | |
Merge topic 'unified-commandline-length'
bbb5c3ef Ninja,Makefile: Unify command line limit logic
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !705
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index aae01ca..a95d4ee 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -246,7 +246,7 @@ void cmGlobalNinjaGenerator::WriteBuild( bool useResponseFile = false; if (cmdLineLimit < 0 || (cmdLineLimit > 0 && - (args.size() + buildstr.size() + assignments.size()) > + (args.size() + buildstr.size() + assignments.size() + 1000) > static_cast<size_t>(cmdLineLimit))) { variable_assignments.str(std::string()); cmGlobalNinjaGenerator::WriteVariable(variable_assignments, "RSP_FILE", |