[Cmake-commits] CMake branch, next, updated. v2.8.6-1945-g2dbaad5
David Cole
david.cole at kitware.com
Fri Nov 18 10:29:49 EST 2011
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 2dbaad551aa9bb41b8a6e8f166a4ec1f4ee788e9 (commit)
via 46c70540ede37c5f2ebeeeba4178340abf92fadb (commit)
via 8e1bbee4d948025dfb1888e0a8b0365d7bd360c8 (commit)
from 81df5a65f1e6459ae0e6e82bd030b9acc037ca44 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2dbaad551aa9bb41b8a6e8f166a4ec1f4ee788e9
commit 2dbaad551aa9bb41b8a6e8f166a4ec1f4ee788e9
Merge: 81df5a6 46c7054
Author: David Cole <david.cole at kitware.com>
AuthorDate: Fri Nov 18 10:29:44 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 18 10:29:44 2011 -0500
Merge topic 'fix-12445-add-call-for-batch-files-vs10' into next
46c7054 VS: Use "call " keyword with .cmd and .bat file custom commands (#12445)
8e1bbee KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=46c70540ede37c5f2ebeeeba4178340abf92fadb
commit 46c70540ede37c5f2ebeeeba4178340abf92fadb
Author: David Cole <david.cole at kitware.com>
AuthorDate: Fri Nov 18 10:15:58 2011 -0500
Commit: David Cole <david.cole at kitware.com>
CommitDate: Fri Nov 18 10:15:58 2011 -0500
VS: Use "call " keyword with .cmd and .bat file custom commands (#12445)
Similar fix to commit d093abef for the Makefile generators. Prevents
premature exit from sequence of commands. Even when no errors occur,
the previous construct without "call " was exiting the sequence before
executing the full set of commands...
diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx
index 4d16409..de1ac30 100644
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@ -250,6 +250,20 @@ cmLocalVisualStudioGenerator
// Add this command line.
std::string cmd = ccg.GetCommand(c);
+
+ // Use "call " before any invocations of .bat or .cmd files
+ // invoked as custom commands.
+ //
+ std::string suffix;
+ if (cmd.size() > 4)
+ {
+ suffix = cmSystemTools::LowerCase(cmd.substr(cmd.size()-4));
+ if (suffix == ".bat" || suffix == ".cmd")
+ {
+ script += "call ";
+ }
+ }
+
script += this->Convert(cmd.c_str(), relativeRoot, SHELL);
ccg.AppendArguments(c, script);
-----------------------------------------------------------------------
Summary of changes:
Source/cmLocalVisualStudioGenerator.cxx | 14 ++++++++++++++
Source/kwsys/kwsysDateStamp.cmake | 2 +-
2 files changed, 15 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list