summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalNinjaGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-04-25 13:41:14 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-04-25 13:41:18 (GMT)
commit74672e2ffaaa7f6c0efa1884a3f8d239d36ec7bf (patch)
treea26d41e0d84ac2b705ebf486efae21bae05efe12 /Source/cmGlobalNinjaGenerator.cxx
parent7dca104e14519be4ff28978a1553a3395ecaf6d2 (diff)
parent594d3d6fffac33062629bafb819a5df7c1326824 (diff)
downloadCMake-74672e2ffaaa7f6c0efa1884a3f8d239d36ec7bf.zip
CMake-74672e2ffaaa7f6c0efa1884a3f8d239d36ec7bf.tar.gz
CMake-74672e2ffaaa7f6c0efa1884a3f8d239d36ec7bf.tar.bz2
Merge topic 'ninja-dyndep-response-file'
594d3d6f Ninja: support response file for cmake_ninja_depends on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !722
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
-rw-r--r--Source/cmGlobalNinjaGenerator.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 1a77d7c..587e18a 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1842,10 +1842,14 @@ bool cmGlobalNinjaGenerator::WriteDyndepFile(
int cmcmd_cmake_ninja_dyndep(std::vector<std::string>::const_iterator argBeg,
std::vector<std::string>::const_iterator argEnd)
{
+ std::vector<std::string> arg_full =
+ cmSystemTools::HandleResponseFile(argBeg, argEnd);
+
std::string arg_dd;
std::string arg_tdi;
std::vector<std::string> arg_ddis;
- for (std::vector<std::string>::const_iterator a = argBeg; a != argEnd; ++a) {
+ for (std::vector<std::string>::const_iterator a = arg_full.begin();
+ a != arg_full.end(); ++a) {
std::string const& arg = *a;
if (cmHasLiteralPrefix(arg, "--tdi=")) {
arg_tdi = arg.substr(6);