summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2010-10-12 15:04:53 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2010-10-12 15:04:53 (GMT)
commitf78f82ccbff1f2bf1781a550de576988331c5450 (patch)
treeb888d2e4810e6a289820636b561feab384a75384
parent3810da1a73de50da76aa014876e606819d51a945 (diff)
parent9072535f836154c7a87bff4569741b86ccfc297f (diff)
downloadCMake-f78f82ccbff1f2bf1781a550de576988331c5450.zip
CMake-f78f82ccbff1f2bf1781a550de576988331c5450.tar.gz
CMake-f78f82ccbff1f2bf1781a550de576988331c5450.tar.bz2
Merge topic 'CodeBlocksGeneratorFixForExternalSubdirs'
9072535 CodeBlocks Generator: Do not omit files in the project file listing.
-rw-r--r--Source/cmExtraCodeBlocksGenerator.cxx4
1 files changed, 0 insertions, 4 deletions
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);