[Cmake-commits] CMake branch, next, updated. v3.2.1-1608-gdbc20bf
Brad King
brad.king at kitware.com
Wed Apr 8 08:47:39 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 dbc20bf6b1c994b8cc5d8009928f7e9041bd9431 (commit)
via 1e3843373f8e0dfd550809ec034d535d31276b6b (commit)
from bf53173a0d19d025fe21e53091a2efe6b1c62a21 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dbc20bf6b1c994b8cc5d8009928f7e9041bd9431
commit dbc20bf6b1c994b8cc5d8009928f7e9041bd9431
Merge: bf53173 1e38433
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 8 08:47:38 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 8 08:47:38 2015 -0400
Merge topic 'cmake-command-line-help-vs-arch' into next
1e384337 cmake: Show in --help how to select VS target platform (#15422)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e3843373f8e0dfd550809ec034d535d31276b6b
commit 1e3843373f8e0dfd550809ec034d535d31276b6b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 7 16:33:05 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 7 16:47:53 2015 -0400
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.
diff --git a/Source/cmDocumentationFormatter.cxx b/Source/cmDocumentationFormatter.cxx
index 4de59c0..6869e2f 100644
--- a/Source/cmDocumentationFormatter.cxx
+++ b/Source/cmDocumentationFormatter.cxx
@@ -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)
{
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index 18d40e1..1c6ac88 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -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
diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx
index ed828b6..5d3ae16 100644
--- a/Source/cmGlobalVisualStudio11Generator.cxx
+++ b/Source/cmGlobalVisualStudio11Generator.cxx
@@ -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
diff --git a/Source/cmGlobalVisualStudio12Generator.cxx b/Source/cmGlobalVisualStudio12Generator.cxx
index c2e6f47..e70e082 100644
--- a/Source/cmGlobalVisualStudio12Generator.cxx
+++ b/Source/cmGlobalVisualStudio12Generator.cxx
@@ -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
diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx
index b551c65..7b1dd24 100644
--- a/Source/cmGlobalVisualStudio14Generator.cxx
+++ b/Source/cmGlobalVisualStudio14Generator.cxx
@@ -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
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index e6ce45d..726db0f 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -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 {
diff --git a/Source/cmGlobalVisualStudio9Generator.cxx b/Source/cmGlobalVisualStudio9Generator.cxx
index 1d73b5c..1bc627f 100644
--- a/Source/cmGlobalVisualStudio9Generator.cxx
+++ b/Source/cmGlobalVisualStudio9Generator.cxx
@@ -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 {
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 5c52a1a..05cfea8 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -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());
+ cmGlobalVisualStudio14Generator::NewFactory());
this->Generators.push_back(
- cmGlobalVisualStudio10Generator::NewFactory());
+ cmGlobalVisualStudio12Generator::NewFactory());
this->Generators.push_back(
cmGlobalVisualStudio11Generator::NewFactory());
this->Generators.push_back(
- cmGlobalVisualStudio12Generator::NewFactory());
+ cmGlobalVisualStudio10Generator::NewFactory());
this->Generators.push_back(
- cmGlobalVisualStudio14Generator::NewFactory());
+ cmGlobalVisualStudio9Generator::NewFactory());
+ this->Generators.push_back(
+ cmGlobalVisualStudio8Generator::NewFactory());
this->Generators.push_back(
cmGlobalVisualStudio71Generator::NewFactory());
this->Generators.push_back(
- cmGlobalVisualStudio8Generator::NewFactory());
+ cmGlobalVisualStudio7Generator::NewFactory());
this->Generators.push_back(
- cmGlobalVisualStudio9Generator::NewFactory());
+ cmGlobalVisualStudio6Generator::NewFactory());
this->Generators.push_back(
cmGlobalBorlandMakefileGenerator::NewFactory());
this->Generators.push_back(
-----------------------------------------------------------------------
Summary of changes:
Source/cmDocumentationFormatter.cxx | 2 +-
Source/cmGlobalVisualStudio10Generator.cxx | 7 +++++--
Source/cmGlobalVisualStudio11Generator.cxx | 7 +++++--
Source/cmGlobalVisualStudio12Generator.cxx | 7 +++++--
Source/cmGlobalVisualStudio14Generator.cxx | 7 +++++--
Source/cmGlobalVisualStudio8Generator.cxx | 7 +++++--
Source/cmGlobalVisualStudio9Generator.cxx | 7 +++++--
Source/cmake.cxx | 16 ++++++++--------
8 files changed, 39 insertions(+), 21 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list