[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-108-g4a19e49
Stephen Kelly
steveire at gmail.com
Tue Oct 6 16:14:13 EDT 2015
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 4a19e497cbdd9e2a17a259e0004f015af87f51fc (commit)
via f51ef97b068d174ecc502374dacf5b5559069499 (commit)
from 4eafc01acb0a24effedaa6b1f9d798a8f971d852 (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=4a19e497cbdd9e2a17a259e0004f015af87f51fc
commit 4a19e497cbdd9e2a17a259e0004f015af87f51fc
Merge: 4eafc01 f51ef97
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 6 16:14:12 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 16:14:12 2015 -0400
Merge topic 'refactor-current-dir-initialization' into next
f51ef97b fixup! Set the current dirs on the snapshot before creating the cmMakefile.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f51ef97b068d174ecc502374dacf5b5559069499
commit f51ef97b068d174ecc502374dacf5b5559069499
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 6 22:13:31 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:13:31 2015 +0200
fixup! Set the current dirs on the snapshot before creating the cmMakefile.
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 183b6e7..fececfd 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -381,6 +381,7 @@ void cmake::ReadListFile(const std::vector<std::string>& args,
(cmSystemTools::GetCurrentWorkingDirectory());
snapshot.GetDirectory().SetCurrentSource
(cmSystemTools::GetCurrentWorkingDirectory());
+ cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(gg, snapshot));
if (this->GetWorkingMode() != NORMAL_MODE)
{
std::string file(cmSystemTools::CollapseFullPath(path));
-----------------------------------------------------------------------
Summary of changes:
Source/cmake.cxx | 1 +
1 file changed, 1 insertion(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list