[Cmake-commits] CMake branch, next, updated. v2.8.2-1005-gff564fa

[Alexander Neundorf]

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  ff564fa8c3924a85d29f02d06567271c8dcc49b0 (commit)
       via  9072535f836154c7a87bff4569741b86ccfc297f (commit)
      from  db4d60ef6908d005dd29302afe6f3330da5ea11e (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=ff564fa8c3924a85d29f02d06567271c8dcc49b0
commit ff564fa8c3924a85d29f02d06567271c8dcc49b0
Merge: db4d60e 9072535
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Oct 5 21:17:25 2010 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Oct 5 21:17:25 2010 +0200

    Merge branch 'CodeBlocksGeneratorFixForExternalSubdirs' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9072535f836154c7a87bff4569741b86ccfc297f
commit 9072535f836154c7a87bff4569741b86ccfc297f
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Oct 5 21:16:17 2010 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Oct 5 21:16:17 2010 +0200

    CodeBlocks Generator: Do not omit files in the project file listing.
    
    The CodeBlocks generator used to omit files that were in siblings directories.
    Though that filters out a few files that could be argued aren't of interest
    to the user, it also potentialy hides files that are relevant to the user.
    
    Patch by Daniel Teske.
    
    Alex
    
    See: http://bugreports.qt.nokia.com/browse/QTCREATORBUG-2250 for an example.

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 4cb2b48..e6d7a6d 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -289,14 +289,10 @@ void cmExtraCodeBlocksGenerator
       std::string fileName = *(splitted.end()-1);
       splitted.erase(splitted.end() - 1, splitted.end());
 
-      // We don't want paths with ".." in them
-      // reasons are that we don't want files outside the project
-      // TODO: the path should be normalized first though
       // We don't want paths with CMakeFiles in them
       // or do we?
       // In speedcrunch those where purely internal
       if (splitted.size() >= 1
-          && relative.find("..") == std::string::npos
           && relative.find("CMakeFiles") == std::string::npos)
         {
         tree.InsertPath(splitted, 1, fileName);

-----------------------------------------------------------------------

Summary of changes:
 Source/cmExtraCodeBlocksGenerator.cxx |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake