cmake: Show in --help how to select VS target platform (#15422)

* Re-order VS generators from newest to oldest.

* Show how to specify a VS generator with a target platform

* Increase the option output indentation to avoid extra wrapping
  with longer generator names.
This commit is contained in:
Brad King 2015-04-07 16:33:05 -04:00
parent 7ee897beec
commit 1e3843373f
8 changed files with 41 additions and 23 deletions

View File

@ -204,7 +204,7 @@ void cmDocumentationFormatter
if(!op->Name.empty()) if(!op->Name.empty())
{ {
os << " " << op->Name; os << " " << op->Name;
this->TextIndent = " "; this->TextIndent = " ";
int align = static_cast<int>(strlen(this->TextIndent))-4; int align = static_cast<int>(strlen(this->TextIndent))-4;
for(int i = static_cast<int>(op->Name.size()); i < align; ++i) for(int i = static_cast<int>(op->Name.size()); i < align; ++i)
{ {

View File

@ -71,8 +71,11 @@ public:
virtual void GetDocumentation(cmDocumentationEntry& entry) const virtual void GetDocumentation(cmDocumentationEntry& entry) const
{ {
entry.Name = vs10generatorName; entry.Name = std::string(vs10generatorName) + " [arch]";
entry.Brief = "Generates Visual Studio 10 (VS 2010) project files."; entry.Brief =
"Generates Visual Studio 2010 project files. "
"Optional [arch] can be \"Win64\" or \"IA64\"."
;
} }
virtual void GetGenerators(std::vector<std::string>& names) const virtual void GetGenerators(std::vector<std::string>& names) const

View File

@ -78,8 +78,11 @@ public:
virtual void GetDocumentation(cmDocumentationEntry& entry) const virtual void GetDocumentation(cmDocumentationEntry& entry) const
{ {
entry.Name = vs11generatorName; entry.Name = std::string(vs11generatorName) + " [arch]";
entry.Brief = "Generates Visual Studio 11 (VS 2012) project files."; entry.Brief =
"Generates Visual Studio 2012 project files. "
"Optional [arch] can be \"Win64\" or \"ARM\"."
;
} }
virtual void GetGenerators(std::vector<std::string>& names) const virtual void GetGenerators(std::vector<std::string>& names) const

View File

@ -66,8 +66,11 @@ public:
virtual void GetDocumentation(cmDocumentationEntry& entry) const virtual void GetDocumentation(cmDocumentationEntry& entry) const
{ {
entry.Name = vs12generatorName; entry.Name = std::string(vs12generatorName) + " [arch]";
entry.Brief = "Generates Visual Studio 12 (VS 2013) project files."; entry.Brief =
"Generates Visual Studio 2013 project files. "
"Optional [arch] can be \"Win64\" or \"ARM\"."
;
} }
virtual void GetGenerators(std::vector<std::string>& names) const virtual void GetGenerators(std::vector<std::string>& names) const

View File

@ -66,8 +66,11 @@ public:
virtual void GetDocumentation(cmDocumentationEntry& entry) const virtual void GetDocumentation(cmDocumentationEntry& entry) const
{ {
entry.Name = vs14generatorName; entry.Name = std::string(vs14generatorName) + " [arch]";
entry.Brief = "Generates Visual Studio 14 (VS 2015) project files."; entry.Brief =
"Generates Visual Studio 2015 project files. "
"Optional [arch] can be \"Win64\" or \"ARM\"."
;
} }
virtual void GetGenerators(std::vector<std::string>& names) const virtual void GetGenerators(std::vector<std::string>& names) const

View File

@ -66,8 +66,11 @@ public:
} }
virtual void GetDocumentation(cmDocumentationEntry& entry) const { virtual void GetDocumentation(cmDocumentationEntry& entry) const {
entry.Name = vs8generatorName; entry.Name = std::string(vs8generatorName) + " [arch]";
entry.Brief = "Generates Visual Studio 8 2005 project files."; entry.Brief =
"Generates Visual Studio 2005 project files. "
"Optional [arch] can be \"Win64\"."
;
} }
virtual void GetGenerators(std::vector<std::string>& names) const { virtual void GetGenerators(std::vector<std::string>& names) const {

View File

@ -70,8 +70,11 @@ public:
} }
virtual void GetDocumentation(cmDocumentationEntry& entry) const { virtual void GetDocumentation(cmDocumentationEntry& entry) const {
entry.Name = vs9generatorName; entry.Name = std::string(vs9generatorName) + " [arch]";
entry.Brief = "Generates Visual Studio 9 2008 project files."; entry.Brief =
"Generates Visual Studio 2008 project files. "
"Optional [arch] can be \"Win64\" or \"IA64\"."
;
} }
virtual void GetGenerators(std::vector<std::string>& names) const { virtual void GetGenerators(std::vector<std::string>& names) const {

View File

@ -1817,23 +1817,23 @@ void cmake::AddDefaultGenerators()
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32) && !defined(__CYGWIN__)
# if !defined(CMAKE_BOOT_MINGW) # if !defined(CMAKE_BOOT_MINGW)
this->Generators.push_back( this->Generators.push_back(
cmGlobalVisualStudio6Generator::NewFactory()); cmGlobalVisualStudio14Generator::NewFactory());
this->Generators.push_back(
cmGlobalVisualStudio7Generator::NewFactory());
this->Generators.push_back(
cmGlobalVisualStudio10Generator::NewFactory());
this->Generators.push_back(
cmGlobalVisualStudio11Generator::NewFactory());
this->Generators.push_back( this->Generators.push_back(
cmGlobalVisualStudio12Generator::NewFactory()); cmGlobalVisualStudio12Generator::NewFactory());
this->Generators.push_back( this->Generators.push_back(
cmGlobalVisualStudio14Generator::NewFactory()); cmGlobalVisualStudio11Generator::NewFactory());
this->Generators.push_back( this->Generators.push_back(
cmGlobalVisualStudio71Generator::NewFactory()); cmGlobalVisualStudio10Generator::NewFactory());
this->Generators.push_back(
cmGlobalVisualStudio9Generator::NewFactory());
this->Generators.push_back( this->Generators.push_back(
cmGlobalVisualStudio8Generator::NewFactory()); cmGlobalVisualStudio8Generator::NewFactory());
this->Generators.push_back( this->Generators.push_back(
cmGlobalVisualStudio9Generator::NewFactory()); cmGlobalVisualStudio71Generator::NewFactory());
this->Generators.push_back(
cmGlobalVisualStudio7Generator::NewFactory());
this->Generators.push_back(
cmGlobalVisualStudio6Generator::NewFactory());
this->Generators.push_back( this->Generators.push_back(
cmGlobalBorlandMakefileGenerator::NewFactory()); cmGlobalBorlandMakefileGenerator::NewFactory());
this->Generators.push_back( this->Generators.push_back(