[Cmake-commits] CMake branch, next, updated. v3.2.1-1472-ga78a2f8

[Stephen Kelly]

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  a78a2f8997a87806fb04e833c27b684b7c20fb3e (commit)
       via  a469bf7b98bb2fc82de874383b0538e2d32ab2e1 (commit)
       via  257c16495ae0653d8f3630c8d76e6496bc9edd86 (commit)
       via  fe17092c20c39761a060508fc6b1979b06e84afe (commit)
       via  199b28ac3ab5cc2dc99b352b8653a03f93baf3e5 (commit)
      from  646bd1ab578d9e29cdec80f8f8a16ddb657f0303 (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=a78a2f8997a87806fb04e833c27b684b7c20fb3e
commit a78a2f8997a87806fb04e833c27b684b7c20fb3e
Merge: 646bd1a a469bf7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Apr 4 12:36:41 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Apr 4 12:36:41 2015 -0400

    Merge topic 'minor-cleanups' into next
    
    a469bf7b cmMakefile: Remove one wrong and one insufficiently helpful comment.
    257c1649 cmListFile: Remove unused member.
    fe17092c cmMakefile: Remove bogus comment.
    199b28ac Remove duplicate tag name.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a469bf7b98bb2fc82de874383b0538e2d32ab2e1
commit a469bf7b98bb2fc82de874383b0538e2d32ab2e1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Apr 4 15:47:49 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Apr 4 18:31:03 2015 +0200

    cmMakefile: Remove one wrong and one insufficiently helpful comment.

diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index e18a4a7..7c2085a 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -981,9 +981,8 @@ protected:
   // directories.
   std::set<std::string> SystemIncludeDirectories;
 
-  std::vector<std::string> ListFiles; // list of command files loaded
-  std::vector<std::string> OutputFiles; // list of command files loaded
-
+  std::vector<std::string> ListFiles;
+  std::vector<std::string> OutputFiles;
 
   cmTarget::LinkLibraryVectorType LinkLibraries;
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=257c16495ae0653d8f3630c8d76e6496bc9edd86
commit 257c16495ae0653d8f3630c8d76e6496bc9edd86
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Apr 4 15:47:24 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Apr 4 18:31:03 2015 +0200

    cmListFile: Remove unused member.
    
    It is written, but not read since commit v2.4.0~575 (ENH: Since list file
    cache does not make much sense any more ..., 2006-02-07).

diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx
index 3e26349..ddcea9b 100644
--- a/Source/cmListFileCache.cxx
+++ b/Source/cmListFileCache.cxx
@@ -146,18 +146,12 @@ bool cmListFile::ParseFile(const char* filename,
     }
 
   bool parseError = false;
-  this->ModifiedTime = cmSystemTools::ModifiedTime(filename);
 
   {
   cmListFileParser parser(this, mf, filename);
   parseError = !parser.ParseFile();
   }
 
-  if(parseError)
-    {
-    this->ModifiedTime = 0;
-    }
-
   // do we need a cmake_policy(VERSION call?
   if(topLevel)
   {
diff --git a/Source/cmListFileCache.h b/Source/cmListFileCache.h
index 2ca9b8e..544ff1b 100644
--- a/Source/cmListFileCache.h
+++ b/Source/cmListFileCache.h
@@ -85,15 +85,10 @@ class cmListFileBacktrace: public std::vector<cmListFileContext>
 
 struct cmListFile
 {
-  cmListFile()
-    :ModifiedTime(0)
-    {
-    }
   bool ParseFile(const char* path,
                  bool topLevel,
                  cmMakefile *mf);
 
-  long int ModifiedTime;
   std::vector<cmListFileFunction> Functions;
 };
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe17092c20c39761a060508fc6b1979b06e84afe
commit fe17092c20c39761a060508fc6b1979b06e84afe
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Apr 4 15:30:25 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Apr 4 18:31:03 2015 +0200

    cmMakefile: Remove bogus comment.

diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index ebfe508..e18a4a7 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -776,10 +776,6 @@ public:
   ///enabled.
   void EnableLanguage(std::vector<std::string>const& languages, bool optional);
 
-  /**
-   * Set/Get the name of the parent directories CMakeLists file
-   * given a current CMakeLists file name
-   */
   cmCacheManager *GetCacheManager() const;
 
   /**

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=199b28ac3ab5cc2dc99b352b8653a03f93baf3e5
commit 199b28ac3ab5cc2dc99b352b8653a03f93baf3e5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 18 21:18:44 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Apr 4 18:30:52 2015 +0200

    Remove duplicate tag name.

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 673dcb9..2654851 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1554,7 +1554,6 @@ class ArtifactPdbTag;
 
 class ArtifactPathTag;
 class ArtifactDirTag;
-class ArtifactNameTag;
 
 //----------------------------------------------------------------------------
 template<typename ArtifactT>

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

Summary of changes:
 Source/cmGeneratorExpressionNode.cxx |    1 -
 Source/cmListFileCache.cxx           |    6 ------
 Source/cmListFileCache.h             |    5 -----
 Source/cmMakefile.h                  |    9 ++-------
 4 files changed, 2 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
CMake