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 636110ae1f022f80fba39365240e1153b8633332 (commit)
via 41a8b8826b8977446cf5a95b77c59949674ab63a (commit)
from d2594605c46f3f388b9a13f9cea69ca774fa0f78 (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=636110ae1f022f80fba39365240e1153b8633332
commit 636110ae1f022f80fba39365240e1153b8633332
Merge: d259460 41a8b88
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Aug 3 09:42:36 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Aug 3 09:42:36 2016 -0400
Merge topic 'extra-generator-factories' into next
41a8b882 fixup! Refactor extra generator registration to use factories
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41a8b8826b8977446cf5a95b77c59949674ab63a
commit 41a8b8826b8977446cf5a95b77c59949674ab63a
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Aug 3 09:41:58 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Aug 3 09:41:58 2016 -0400
fixup! Refactor extra generator registration to use factories
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx
b/Source/cmExtraCodeBlocksGenerator.cxx
index a846643..3a9bb9b 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -42,7 +42,7 @@ cmExtraCodeBlocksGenerator::cmExtraCodeBlocksGenerator()
}
cmExternalMakefileProjectGeneratorFactory*
-cmExtraCodeBlocksGenerator::NewFactory()
+cmExtraCodeBlocksGenerator::GetFactory()
{
static cmExternalMakefileProjectGeneratorSimpleFactory<
cmExtraCodeBlocksGenerator>
diff --git a/Source/cmExtraCodeBlocksGenerator.h
b/Source/cmExtraCodeBlocksGenerator.h
index 55e21c6..b39080c 100644
--- a/Source/cmExtraCodeBlocksGenerator.h
+++ b/Source/cmExtraCodeBlocksGenerator.h
@@ -28,7 +28,7 @@ class cmExtraCodeBlocksGenerator : public
cmExternalMakefileProjectGenerator
public:
cmExtraCodeBlocksGenerator();
- static cmExternalMakefileProjectGeneratorFactory* NewFactory();
+ static cmExternalMakefileProjectGeneratorFactory* GetFactory();
void Generate() CM_OVERRIDE;
diff --git a/Source/cmExtraCodeLiteGenerator.cxx
b/Source/cmExtraCodeLiteGenerator.cxx
index 2bb6ff4..eda6867 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -35,7 +35,7 @@ cmExtraCodeLiteGenerator::cmExtraCodeLiteGenerator()
}
cmExternalMakefileProjectGeneratorFactory*
-cmExtraCodeLiteGenerator::NewFactory()
+cmExtraCodeLiteGenerator::GetFactory()
{
static cmExternalMakefileProjectGeneratorSimpleFactory<
cmExtraCodeLiteGenerator>
diff --git a/Source/cmExtraCodeLiteGenerator.h
b/Source/cmExtraCodeLiteGenerator.h
index 9eb0fb3..e20e745 100644
--- a/Source/cmExtraCodeLiteGenerator.h
+++ b/Source/cmExtraCodeLiteGenerator.h
@@ -36,7 +36,7 @@ protected:
public:
cmExtraCodeLiteGenerator();
- static cmExternalMakefileProjectGeneratorFactory* NewFactory();
+ static cmExternalMakefileProjectGeneratorFactory* GetFactory();
void Generate() CM_OVERRIDE;
void CreateProjectFile(const std::vector<cmLocalGenerator*>& lgs);
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx
b/Source/cmExtraEclipseCDT4Generator.cxx
index b26c4d0..8091bcf 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -55,7 +55,7 @@ cmExtraEclipseCDT4Generator::cmExtraEclipseCDT4Generator()
}
cmExternalMakefileProjectGeneratorFactory*
-cmExtraEclipseCDT4Generator::NewFactory()
+cmExtraEclipseCDT4Generator::GetFactory()
{
static cmExternalMakefileProjectGeneratorSimpleFactory<
cmExtraEclipseCDT4Generator>
diff --git a/Source/cmExtraEclipseCDT4Generator.h
b/Source/cmExtraEclipseCDT4Generator.h
index d1c4684..4b585c3 100644
--- a/Source/cmExtraEclipseCDT4Generator.h
+++ b/Source/cmExtraEclipseCDT4Generator.h
@@ -35,7 +35,7 @@ public:
cmExtraEclipseCDT4Generator();
- static cmExternalMakefileProjectGeneratorFactory* NewFactory();
+ static cmExternalMakefileProjectGeneratorFactory* GetFactory();
void EnableLanguage(std::vector<std::string> const& languages, cmMakefile*,
bool optional) CM_OVERRIDE;
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 8cc2b5e..4e72504 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -27,7 +27,7 @@ cmExtraKateGenerator::cmExtraKateGenerator()
{
}
-cmExternalMakefileProjectGeneratorFactory* cmExtraKateGenerator::NewFactory()
+cmExternalMakefileProjectGeneratorFactory* cmExtraKateGenerator::GetFactory()
{
static cmExternalMakefileProjectGeneratorSimpleFactory<cmExtraKateGenerator>
factory("Kate", "Generates Kate project files.");
diff --git a/Source/cmExtraKateGenerator.h b/Source/cmExtraKateGenerator.h
index 1ac1c30..3d16052 100644
--- a/Source/cmExtraKateGenerator.h
+++ b/Source/cmExtraKateGenerator.h
@@ -26,7 +26,7 @@ class cmExtraKateGenerator : public
cmExternalMakefileProjectGenerator
public:
cmExtraKateGenerator();
- static cmExternalMakefileProjectGeneratorFactory* NewFactory();
+ static cmExternalMakefileProjectGeneratorFactory* GetFactory();
void Generate() CM_OVERRIDE;
diff --git a/Source/cmExtraSublimeTextGenerator.cxx
b/Source/cmExtraSublimeTextGenerator.cxx
index 3e1a48e..b6bad60 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -39,7 +39,7 @@ http://sublimetext.info/docs/en/reference/build_systems.html
*/
cmExternalMakefileProjectGeneratorFactory*
-cmExtraSublimeTextGenerator::NewFactory()
+cmExtraSublimeTextGenerator::GetFactory()
{
static cmExternalMakefileProjectGeneratorSimpleFactory<
cmExtraSublimeTextGenerator>
diff --git a/Source/cmExtraSublimeTextGenerator.h
b/Source/cmExtraSublimeTextGenerator.h
index ea710d9..c087825 100644
--- a/Source/cmExtraSublimeTextGenerator.h
+++ b/Source/cmExtraSublimeTextGenerator.h
@@ -27,7 +27,7 @@ class cmGeneratorTarget;
class cmExtraSublimeTextGenerator : public cmExternalMakefileProjectGenerator
{
public:
- static cmExternalMakefileProjectGeneratorFactory* NewFactory();
+ static cmExternalMakefileProjectGeneratorFactory* GetFactory();
typedef std::map<std::string, std::vector<std::string> > MapSourceFileFlags;
cmExtraSublimeTextGenerator();
diff --git a/Source/cmGlobalKdevelopGenerator.cxx
b/Source/cmGlobalKdevelopGenerator.cxx
index b272084..daf7003 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -31,7 +31,7 @@ cmGlobalKdevelopGenerator::cmGlobalKdevelopGenerator()
}
cmExternalMakefileProjectGeneratorFactory*
-cmGlobalKdevelopGenerator::NewFactory()
+cmGlobalKdevelopGenerator::GetFactory()
{
static cmExternalMakefileProjectGeneratorSimpleFactory<
cmGlobalKdevelopGenerator>
diff --git a/Source/cmGlobalKdevelopGenerator.h
b/Source/cmGlobalKdevelopGenerator.h
index a7d77a9..666527c 100644
--- a/Source/cmGlobalKdevelopGenerator.h
+++ b/Source/cmGlobalKdevelopGenerator.h
@@ -33,7 +33,7 @@ class cmGlobalKdevelopGenerator : public
cmExternalMakefileProjectGenerator
public:
cmGlobalKdevelopGenerator();
- static cmExternalMakefileProjectGeneratorFactory* NewFactory();
+ static cmExternalMakefileProjectGeneratorFactory* GetFactory();
void Generate() CM_OVERRIDE;
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index fb0fac1..b11f4f6 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -796,17 +796,17 @@ int cmake::AddCMakePaths()
void cmake::AddDefaultExtraGenerators()
{
#if defined(CMAKE_BUILD_WITH_CMAKE)
- this->ExtraGenerators.push_back(cmExtraCodeBlocksGenerator::NewFactory());
- this->ExtraGenerators.push_back(cmExtraCodeLiteGenerator::NewFactory());
- this->ExtraGenerators.push_back(cmExtraSublimeTextGenerator::NewFactory());
- this->ExtraGenerators.push_back(cmExtraKateGenerator::NewFactory());
+ this->ExtraGenerators.push_back(cmExtraCodeBlocksGenerator::GetFactory());
+ this->ExtraGenerators.push_back(cmExtraCodeLiteGenerator::GetFactory());
+ this->ExtraGenerators.push_back(cmExtraSublimeTextGenerator::GetFactory());
+ this->ExtraGenerators.push_back(cmExtraKateGenerator::GetFactory());
#ifdef CMAKE_USE_ECLIPSE
- this->ExtraGenerators.push_back(cmExtraEclipseCDT4Generator::NewFactory());
+ this->ExtraGenerators.push_back(cmExtraEclipseCDT4Generator::GetFactory());
#endif
#ifdef CMAKE_USE_KDEVELOP
- this->ExtraGenerators.push_back(cmGlobalKdevelopGenerator::NewFactory());
+ this->ExtraGenerators.push_back(cmGlobalKdevelopGenerator::GetFactory());
#endif
#endif
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmExtraCodeBlocksGenerator.cxx | 2 +-
Source/cmExtraCodeBlocksGenerator.h | 2 +-
Source/cmExtraCodeLiteGenerator.cxx | 2 +-
Source/cmExtraCodeLiteGenerator.h | 2 +-
Source/cmExtraEclipseCDT4Generator.cxx | 2 +-
Source/cmExtraEclipseCDT4Generator.h | 2 +-
Source/cmExtraKateGenerator.cxx | 2 +-
Source/cmExtraKateGenerator.h | 2 +-
Source/cmExtraSublimeTextGenerator.cxx | 2 +-
Source/cmExtraSublimeTextGenerator.h | 2 +-
Source/cmGlobalKdevelopGenerator.cxx | 2 +-
Source/cmGlobalKdevelopGenerator.h | 2 +-
Source/cmake.cxx | 12 ++++++------
13 files changed, 18 insertions(+), 18 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
