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 0eec6e7eddd33651a96c3d6aa708f7e8ca4e566e (commit)
via e7c58f6c35d110a43c483a796fef644c6e22ce89 (commit)
from ed86e1ad349626d9e71af0ced368df6361bab2cc (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=0eec6e7eddd33651a96c3d6aa708f7e8ca4e566e
commit 0eec6e7eddd33651a96c3d6aa708f7e8ca4e566e
Merge: ed86e1a e7c58f6
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Thu Apr 18 14:20:11 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Apr 18 14:20:11 2013 -0400
Merge topic 'ninja_add_custom_command_windows' into next
e7c58f6 Ninja: use cd /D to set directory on Windows
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7c58f6c35d110a43c483a796fef644c6e22ce89
commit e7c58f6c35d110a43c483a796fef644c6e22ce89
Author: Ian Monroe <i...@hipchat.com>
AuthorDate: Thu Apr 18 10:57:39 2013 -0700
Commit: Robert Maynard <robert.mayn...@kitware.com>
CommitDate: Thu Apr 18 14:16:46 2013 -0400
Ninja: use cd /D to set directory on Windows
Add_custom_command was unable to handle build and source directories
existing on different drives.
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index d902f4e..294a539 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -302,7 +302,12 @@ void cmLocalNinjaGenerator::AppendCustomCommandLines(const
cmCustomCommand *cc,
wd = this->GetMakefile()->GetStartOutputDirectory();
cmOStringStream cdCmd;
- cdCmd << "cd " << this->ConvertToOutputFormat(wd, SHELL);
+#ifdef _WIN32
+ std::string cdStr = "cd /D ";
+#else
+ std::string cdStr = "cd ";
+#endif
+ cdCmd << cdStr << this->ConvertToOutputFormat(wd, SHELL);
cmdLines.push_back(cdCmd.str());
}
for (unsigned i = 0; i != ccg.GetNumberOfCommands(); ++i) {
-----------------------------------------------------------------------
Summary of changes:
Source/cmLocalNinjaGenerator.cxx | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
