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 bb8ef43a060a90d5e7f686c44a7ec5b5754b17ca (commit)
via f32f6f0652b8b99abd2cf8558a193571e47e9217 (commit)
from 25451865e6fe88c14d581a3d7f0b6fb6e046a2b9 (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=bb8ef43a060a90d5e7f686c44a7ec5b5754b17ca
commit bb8ef43a060a90d5e7f686c44a7ec5b5754b17ca
Merge: 2545186 f32f6f0
Author: Alexander Neundorf <neund...@kde.org>
AuthorDate: Fri Jul 29 17:27:46 2011 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Jul 29 17:27:46 2011 -0400
Merge topic 'ExcludeCMakesFilesFromCodeBlocksProject' into next
f32f6f0 Don't put files from CMAKE_ROOT into CodeBlocks projects (#12110)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f32f6f0652b8b99abd2cf8558a193571e47e9217
commit f32f6f0652b8b99abd2cf8558a193571e47e9217
Author: Alex Neundorf <neund...@kde.org>
AuthorDate: Fri Jul 29 23:24:21 2011 +0200
Commit: Alex Neundorf <neund...@kde.org>
CommitDate: Fri Jul 29 23:24:21 2011 +0200
Don't put files from CMAKE_ROOT into CodeBlocks projects (#12110)
This causes that all files in C::B are displayed in a tree starting at /
Alex
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx
b/Source/cmExtraCodeBlocksGenerator.cxx
index 4f93067..28ea10a 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -266,10 +266,17 @@ void cmExtraCodeBlocksGenerator
}
// Convert
+ const char* cmakeRoot = mf->GetDefinition("CMAKE_ROOT");
for (std::vector<std::string>::const_iterator jt = listFiles.begin();
jt != listFiles.end();
++jt)
{
+ // don't put cmake's own files into the project (#12110):
+ if (jt->find(cmakeRoot) == 0)
+ {
+ continue;
+ }
+
const std::string &relative = cmSystemTools::RelativePath(
it->second[0]->GetMakefile()->GetHomeDirectory(),
jt->c_str());
-----------------------------------------------------------------------
Summary of changes:
Source/cmExtraCodeBlocksGenerator.cxx | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
