[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-718-g25dc8c0
Brad King
brad.king at kitware.com
Thu Mar 2 08:18:06 EST 2017
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 25dc8c09860498aaba135aed5a05fa3b55b304d0 (commit)
via 823d54d1be0ce6c56c60927b1905e36130c69327 (commit)
from 6a1c76184210f5dc289293bb27d5d322c0a5f67d (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=25dc8c09860498aaba135aed5a05fa3b55b304d0
commit 25dc8c09860498aaba135aed5a05fa3b55b304d0
Merge: 6a1c761 823d54d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 2 08:18:03 2017 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 2 08:18:03 2017 -0500
Merge topic 'implicit-dir-symlinks' into next
823d54d1 fixup! cmOrderDirectories: Consider symlinks when checking implicit
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=823d54d1be0ce6c56c60927b1905e36130c69327
commit 823d54d1be0ce6c56c60927b1905e36130c69327
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 2 08:16:45 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 2 08:16:45 2017 -0500
fixup! cmOrderDirectories: Consider symlinks when checking implicit
diff --git a/Source/cmOrderDirectories.cxx b/Source/cmOrderDirectories.cxx
index dfba80e..d48eb53 100644
--- a/Source/cmOrderDirectories.cxx
+++ b/Source/cmOrderDirectories.cxx
@@ -346,7 +346,7 @@ void cmOrderDirectories::SetImplicitDirectories(
std::set<std::string> const& implicitDirs)
{
this->ImplicitDirectories.clear();
- for (std::set<std::string>::iterator i = implicitDirs.begin();
+ for (std::set<std::string>::const_iterator i = implicitDirs.begin();
i != implicitDirs.end(); ++i) {
this->ImplicitDirectories.insert(this->GetRealPath(*i));
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmOrderDirectories.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list