summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2016-07-21 11:24:11 (GMT)
committerBrad King <brad.king@kitware.com>2016-08-03 13:44:40 (GMT)
commitcd52a225d298dc1a4924b82ebac0ac74fccf3356 (patch)
tree7fc4c8ed789ab189a2f09e8f90beb627dc8c2b6b
parenta354f60ce07cd67bd60161824a4e74bf9068fea4 (diff)
downloadCMake-cd52a225d298dc1a4924b82ebac0ac74fccf3356.zip
CMake-cd52a225d298dc1a4924b82ebac0ac74fccf3356.tar.gz
CMake-cd52a225d298dc1a4924b82ebac0ac74fccf3356.tar.bz2
Report more information about extra generators in generator factories
-rw-r--r--Source/cmake.cxx7
-rw-r--r--Source/cmake.h2
2 files changed, 9 insertions, 0 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index fb77043..b11f4f6 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -824,6 +824,7 @@ void cmake::GetRegisteredGenerators(std::vector<GeneratorInfo>& generators)
info.supportsToolset = (*i)->SupportsToolset();
info.supportsPlatform = (*i)->SupportsPlatform();
info.name = names[j];
+ info.baseName = names[j];
info.isAlias = false;
generators.push_back(info);
}
@@ -840,6 +841,8 @@ void cmake::GetRegisteredGenerators(std::vector<GeneratorInfo>& generators)
GeneratorInfo info;
info.name = cmExternalMakefileProjectGenerator::CreateFullGeneratorName(
(*i)->GetName(), *gen);
+ info.baseName = *gen;
+ info.extraName = (*i)->GetName();
info.supportsPlatform = false;
info.supportsToolset = false;
info.isAlias = false;
@@ -849,6 +852,10 @@ void cmake::GetRegisteredGenerators(std::vector<GeneratorInfo>& generators)
a != (*i)->Aliases.end(); ++a) {
GeneratorInfo info;
info.name = *a;
+ if (!genList.empty()) {
+ info.baseName = genList.at(0);
+ }
+ info.extraName = (*i)->GetName();
info.supportsPlatform = false;
info.supportsToolset = false;
info.isAlias = true;
diff --git a/Source/cmake.h b/Source/cmake.h
index 0fd2d31..304a15d 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -103,6 +103,8 @@ public:
struct GeneratorInfo
{
std::string name;
+ std::string baseName;
+ std::string extraName;
bool supportsToolset;
bool supportsPlatform;
bool isAlias;