This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 766a6d410995f190aa53ad79823855763e944b46 (commit)
via 7c2c4985666e31da6c5973a667c68576291a7072 (commit)
from 685ce51d88db1f69ac378a7a6f23f41101520870 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=766a6d410995f190aa53ad79823855763e944b46
commit 766a6d410995f190aa53ad79823855763e944b46
Merge: 685ce51 7c2c498
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Apr 7 09:45:16 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Apr 7 09:45:16 2016 -0400
Merge topic 'ninja-object-rsp' into next
7c2c4985 fixup! Ninja: Honor CMAKE_NINJA_FORCE_RESPONSE_FILE for compile
rules
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c2c4985666e31da6c5973a667c68576291a7072
commit 7c2c4985666e31da6c5973a667c68576291a7072
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Apr 7 09:44:55 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Apr 7 09:44:55 2016 -0400
fixup! Ninja: Honor CMAKE_NINJA_FORCE_RESPONSE_FILE for compile rules
diff --git a/Source/cmNinjaTargetGenerator.cxx
b/Source/cmNinjaTargetGenerator.cxx
index 4fb1ec7..753a5ae 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -346,14 +346,15 @@ cmNinjaTargetGenerator
std::string rspcontent;
std::string responseFlag;
- if (this->ForceResponseFile()) {
+ if (this->ForceResponseFile())
+ {
rspfile = "$RSP_FILE";
responseFlag = "@" + rspfile;
rspcontent = " $DEFINES $INCLUDES $FLAGS";
flags = responseFlag;
vars.Defines = "";
vars.Includes = "";
- }
+ }
// Tell ninja dependency format so all deps can be loaded into a database
std::string deptype;
-----------------------------------------------------------------------
Summary of changes:
Source/cmNinjaTargetGenerator.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
