[Cmake-commits] CMake branch, next, updated. v2.8.6-2276-g8279bae

[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  8279bae5fdfde13c65d996bffd17aba2c200a11f (commit)
       via  318b0cdf2306a9198baa837885d65423e5f7fc96 (commit)
       via  4bb08e0a9b2d4b652f9bdf06f24c5db57c249abb (commit)
       via  84094cd155d415930631636e6c4c4822a861fd21 (commit)
       via  61da11ecd74461da6edb551d87e29d653df147ad (commit)
      from  b670a6f849521b3e112106a5601d0c6bcbe96715 (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=8279bae5fdfde13c65d996bffd17aba2c200a11f
commit 8279bae5fdfde13c65d996bffd17aba2c200a11f
Merge: b670a6f 318b0cd
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Sun Dec 18 09:47:03 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Dec 18 09:47:03 2011 -0500

    Merge topic 'AddCommentToCDependencyScanner' into next
    
    318b0cd Add comment about one more problem of the C depency scanner.
    4bb08e0 Remove trailing whitespace
    84094cd KWSys Nightly Date Stamp
    61da11e KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=318b0cdf2306a9198baa837885d65423e5f7fc96
commit 318b0cdf2306a9198baa837885d65423e5f7fc96
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sun Dec 18 15:44:33 2011 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Sun Dec 18 15:44:33 2011 +0100

    Add comment about one more problem of the C depency scanner.
    
    Alex

diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx
index 32b212a..44841a9 100644
--- a/Source/cmDependsC.cxx
+++ b/Source/cmDependsC.cxx
@@ -465,6 +465,9 @@ void cmDependsC::Scan(std::istream& is, const char* directory,
       // that this check does not account for the possibility of two
       // headers with the same name in different directories when one
       // is included by double-quotes and the other by angle brackets.
+      // It also does not work properly if two header files with the same
+      // name exist in different directories, and both are included from a
+      // file their own directory by simply using "filename.h" (#12619)
       // This kind of problem will be fixed when a more
       // preprocessor-like implementation of this scanner is created.
       if (this->IncludeRegexScan.find(entry.FileName.c_str()))

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4bb08e0a9b2d4b652f9bdf06f24c5db57c249abb
commit 4bb08e0a9b2d4b652f9bdf06f24c5db57c249abb
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sun Dec 18 15:42:48 2011 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Sun Dec 18 15:42:48 2011 +0100

    Remove trailing whitespace
    
    Alex

diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx
index a76b3af..32b212a 100644
--- a/Source/cmDependsC.cxx
+++ b/Source/cmDependsC.cxx
@@ -237,10 +237,10 @@ bool cmDependsC::WriteDependencies(const char *src, const char *obj,
         fileIt->second->Used=true;
         dependencies.insert(fullName);
         for (std::vector<UnscannedEntry>::const_iterator incIt=
-               fileIt->second->UnscannedEntries.begin(); 
+               fileIt->second->UnscannedEntries.begin();
              incIt!=fileIt->second->UnscannedEntries.end(); ++incIt)
           {
-          if (this->Encountered.find(incIt->FileName) == 
+          if (this->Encountered.find(incIt->FileName) ==
               this->Encountered.end())
             {
             this->Encountered.insert(incIt->FileName);
@@ -278,7 +278,7 @@ bool cmDependsC::WriteDependencies(const char *src, const char *obj,
   for(std::set<cmStdString>::iterator i=dependencies.begin();
       i != dependencies.end(); ++i)
     {
-    makeDepends << obj << ": " << 
+    makeDepends << obj << ": " <<
       this->LocalGenerator->Convert(i->c_str(),
                                     cmLocalGenerator::HOME_OUTPUT,
                                     cmLocalGenerator::MAKEFILE)
@@ -321,9 +321,9 @@ void cmDependsC::ReadCacheFile()
       haveFileName=true;
       int newer=0;
       cmFileTimeComparison comp;
-      bool res=comp.FileTimeCompare(this->CacheFileName.c_str(), 
+      bool res=comp.FileTimeCompare(this->CacheFileName.c_str(),
                                     line.c_str(), &newer);
-      
+
       if ((res==true) && (newer==1)) //cache is newer than the parsed file
         {
         cacheEntry=new cmIncludeLines;
@@ -391,7 +391,7 @@ void cmDependsC::WriteCacheFile() const
     {
     return;
     }
-  
+
   cacheOut << this->IncludeRegexLineString << "\n\n";
   cacheOut << this->IncludeRegexScanString << "\n\n";
   cacheOut << this->IncludeRegexComplainString << "\n\n";
@@ -406,7 +406,7 @@ void cmDependsC::WriteCacheFile() const
       cacheOut<<fileIt->first.c_str()<<std::endl;
 
       for (std::vector<UnscannedEntry>::const_iterator
-             incIt=fileIt->second->UnscannedEntries.begin(); 
+             incIt=fileIt->second->UnscannedEntries.begin();
            incIt!=fileIt->second->UnscannedEntries.end(); ++incIt)
         {
         cacheOut<<incIt->FileName.c_str()<<std::endl;
@@ -431,7 +431,7 @@ void cmDependsC::Scan(std::istream& is, const char* directory,
   cmIncludeLines* newCacheEntry=new cmIncludeLines;
   newCacheEntry->Used=true;
   this->FileCache[fullName]=newCacheEntry;
-  
+
   // Read one line at a time.
   std::string line;
   while(cmSystemTools::GetLineFromStream(is, line))

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

Summary of changes:
 Source/cmDependsC.cxx             |   19 +++++++++++--------
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake