[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-523-g6638bfe

Stephen Kelly steveire at gmail.com
Tue Oct 13 15:31:05 EDT 2015


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  6638bfeba68c732f5441e00fdcd807957d3b041a (commit)
       via  fd7dfcae57604216c18d60efffcd243b5506f5a6 (commit)
      from  da7ed9b1e766d6cb8e657c1420c07eabd726a34a (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6638bfeba68c732f5441e00fdcd807957d3b041a
commit 6638bfeba68c732f5441e00fdcd807957d3b041a
Merge: da7ed9b fd7dfca
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 13 15:31:05 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 13 15:31:05 2015 -0400

    Merge topic 'genex-generator-objects' into next
    
    fd7dfcae fixup! cmMakefile: Store container of cmExportBuildFileGenerators.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd7dfcae57604216c18d60efffcd243b5506f5a6
commit fd7dfcae57604216c18d60efffcd243b5506f5a6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 13 21:30:40 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 13 21:30:40 2015 +0200

    fixup! cmMakefile: Store container of cmExportBuildFileGenerators.

diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 432b57c..fc81708 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -362,7 +362,8 @@ public:
   cmFileLockPool& GetFileLockPool() { return FileLockPool; }
 #endif
 
-  bool GetConfigureDoneCMP0026() const { return this->ConfigureDoneCMP0026AndCMP0024; }
+  bool GetConfigureDoneCMP0026() const
+  { return this->ConfigureDoneCMP0026AndCMP0024; }
 
   void ComputeBuildFileGenerators();
 

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list