diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2012-10-01 20:20:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-10-01 21:06:37 (GMT) |
| commit | dbd99d6fbbdf76181ac01ec9cc32fd3b67a4ce7c (patch) | |
| tree | 695bb8f770438c7a764cd50afa6b33ac6aafaed0 /Source/cmake.h | |
| parent | f1670ab18a21b635e58e1a53178c25c722911504 (diff) | |
| download | CMake-dbd99d6fbbdf76181ac01ec9cc32fd3b67a4ce7c.zip CMake-dbd99d6fbbdf76181ac01ec9cc32fd3b67a4ce7c.tar.gz CMake-dbd99d6fbbdf76181ac01ec9cc32fd3b67a4ce7c.tar.bz2 | |
Revert "Ninja: don't expand any rsp files"
This reverts commit 5598d9b2a06d4ec788b5e058435bb3bba99fd517.
Since commit f1670ab1 (Ninja: don't confuse ninja's rsp files with
nmake's, 2012-09-26) Ninja generator response files are placed in
CMakeFiles/ so the previously existing check already avoids expanding
them.
Diffstat (limited to 'Source/cmake.h')
| -rw-r--r-- | Source/cmake.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmake.h b/Source/cmake.h index 12e5edf..94c6f12 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -447,8 +447,7 @@ protected: std::string const& link); static int ExecuteEchoColor(std::vector<std::string>& args); static int ExecuteLinkScript(std::vector<std::string>& args); - static int VisualStudioLink(std::vector<std::string>& args, int type, - bool no_rsp_expand); + static int VisualStudioLink(std::vector<std::string>& args, int type); static int VisualStudioLinkIncremental(std::vector<std::string>& args, int type, bool verbose); |