kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'cmake-command-line-help-vs-arch' 

1e384337 cmake: Show in --help how to select VS target platform (#15422)
This commit is contained in:
Brad King 2015-04-09 11:32:34 -04:00 committed by CMake Topic Stage
parent 1a1bdbfd87 1e3843373f
commit 81f627d53b
8 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmDocumentationFormatter.cxx
View File

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

7
Source/cmGlobalVisualStudio10Generator.cxx
View File

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

7
Source/cmGlobalVisualStudio11Generator.cxx
View File

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

7
Source/cmGlobalVisualStudio12Generator.cxx
View File

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

7
Source/cmGlobalVisualStudio14Generator.cxx
View File

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

7
Source/cmGlobalVisualStudio8Generator.cxx
View File

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

7
Source/cmGlobalVisualStudio9Generator.cxx
View File

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

20
Source/cmake.cxx
View File

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