[Cmake-commits] CMake branch, next, updated. v2.8.9-158-g4472d32

[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  4472d32c7dc2ed9981fe9d0d6a4a89abeebbe9d1 (commit)
       via  8aed02ae0f753dce76a167367ecf54be1d04de2b (commit)
       via  7ae4479d655b567d0e2c67e6bdab2580a5c3d4ea (commit)
      from  e1610afa52e341631038f5e524533a2ea0e60344 (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=4472d32c7dc2ed9981fe9d0d6a4a89abeebbe9d1
commit 4472d32c7dc2ed9981fe9d0d6a4a89abeebbe9d1
Merge: e1610af 8aed02a
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Mon Aug 20 15:39:34 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 20 15:39:34 2012 -0400

    Merge topic 'DependencyScanning_13474' into next
    
    8aed02a -fix Java dependency scanning, broken in previous commit
    7ae4479 -fix line length


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8aed02ae0f753dce76a167367ecf54be1d04de2b
commit 8aed02ae0f753dce76a167367ecf54be1d04de2b
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Mon Aug 20 21:37:26 2012 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Mon Aug 20 21:37:26 2012 +0200

    -fix Java dependency scanning, broken in previous commit
    
    Alex

diff --git a/Source/cmDependsJava.cxx b/Source/cmDependsJava.cxx
index 1d84914..ba0e8fb 100644
--- a/Source/cmDependsJava.cxx
+++ b/Source/cmDependsJava.cxx
@@ -38,7 +38,7 @@ bool cmDependsJava::WriteDependencies(const char *src, const char *,
   return true;
 }
 
-bool cmDependsJava::CheckDependencies(std::istream&,
+bool cmDependsJava::CheckDependencies(std::istream&, const char*,
                              std::map<std::string, DependencyVector >&)
 {
   return true;
diff --git a/Source/cmDependsJava.h b/Source/cmDependsJava.h
index fe6fef5..bf7e234 100644
--- a/Source/cmDependsJava.h
+++ b/Source/cmDependsJava.h
@@ -32,7 +32,8 @@ protected:
   virtual bool WriteDependencies(const char *src, const char *file,
     std::ostream& makeDepends, std::ostream& internalDepends);
   virtual bool CheckDependencies(std::istream& internalDepends,
-                  std::map<std::string, DependencyVector >& validDeps);
+                                 const char* internalDependsFileName,
+                           std::map<std::string, DependencyVector>& validDeps);
 
 private:
   cmDependsJava(cmDependsJava const&); // Purposely not implemented.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ae4479d655b567d0e2c67e6bdab2580a5c3d4ea
commit 7ae4479d655b567d0e2c67e6bdab2580a5c3d4ea
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Mon Aug 20 21:23:20 2012 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Mon Aug 20 21:23:20 2012 +0200

    -fix line length
    
    Alex

diff --git a/Source/cmDepends.cxx b/Source/cmDepends.cxx
index 5a48f7f..166a584 100644
--- a/Source/cmDepends.cxx
+++ b/Source/cmDepends.cxx
@@ -243,8 +243,8 @@ bool cmDepends::CheckDependencies(std::istream& internalDepends,
         // The dependee exists, but the depender doesn't. Regenerate if the
         // internalDepends file is older than the dependee.
         int result = 0;
-        if((!this->FileComparison->FileTimeCompare(internalDependsFileName, dependee,
-                                              &result) || result < 0))
+        if((!this->FileComparison->FileTimeCompare(internalDependsFileName,
+                                             dependee, &result) || result < 0))
           {
           // The depends-file is older than the dependee.
           regenerate = true;

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

Summary of changes:
 Source/cmDepends.cxx     |    4 ++--
 Source/cmDependsJava.cxx |    2 +-
 Source/cmDependsJava.h   |    3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake