[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-537-g072df0f

[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  072df0f0ffc41016e39312db0229db059f4680dd (commit)
       via  5ef5fe30bb63325830f7f97710266abd780b227f (commit)
      from  fd94816124c93d886f1c2bf2417d38eecd594ed9 (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=072df0f0ffc41016e39312db0229db059f4680dd
commit 072df0f0ffc41016e39312db0229db059f4680dd
Merge: fd94816 5ef5fe3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 12 02:22:16 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 12 02:22:16 2014 -0500

    Merge topic 'file-GENERATE-source' into next
    
    5ef5fe30 fixup! file(GENERATE): Evaluate early to allow generating source files


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ef5fe30bb63325830f7f97710266abd780b227f
commit 5ef5fe30bb63325830f7f97710266abd780b227f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 12 08:21:48 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Nov 12 08:21:48 2014 +0100

    fixup! file(GENERATE): Evaluate early to allow generating source files

diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 67b6399..8a10d38 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -343,8 +343,10 @@ public:
 
   void CreateEvaluationSourceFiles(std::string const& config) const;
 
-  void SetFilenameTargetDepends(cmSourceFile* sf, std::set<cmTarget const*> tgts);
-  std::set<cmTarget const*> const& GetFilenameTargetDepends(cmSourceFile* sf) const;
+  void SetFilenameTargetDepends(cmSourceFile* sf,
+                                std::set<cmTarget const*> tgts);
+  std::set<cmTarget const*> const&
+  GetFilenameTargetDepends(cmSourceFile* sf) const;
 
 protected:
   virtual void Generate();

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

Summary of changes:
 Source/cmGlobalGenerator.h |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake