[Cmake-commits] CMake branch, next, updated. v3.6.2-2662-g9dbd761
Brad King
brad.king at kitware.com
Fri Sep 30 11:54:41 EDT 2016
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 9dbd7615358850db6121ab78eba14a1a14154159 (commit)
via 39c898a107269a488b9dcb72bf99c545ab35e54c (commit)
from d80c9cf25a5d19a7d29c21abe5faadd23c91593d (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=9dbd7615358850db6121ab78eba14a1a14154159
commit 9dbd7615358850db6121ab78eba14a1a14154159
Merge: d80c9cf 39c898a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 30 11:54:40 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 30 11:54:40 2016 -0400
Merge topic 'doc-cmake-A-link' into next
39c898a1 Help: Clarify that `cmake -A` option sets VS IDE target architecture
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=39c898a107269a488b9dcb72bf99c545ab35e54c
commit 39c898a107269a488b9dcb72bf99c545ab35e54c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 30 11:50:46 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 30 11:54:16 2016 -0400
Help: Clarify that `cmake -A` option sets VS IDE target architecture
diff --git a/Help/generator/Visual Studio 10 2010.rst b/Help/generator/Visual Studio 10 2010.rst
index 77ea9df..c694443 100644
--- a/Help/generator/Visual Studio 10 2010.rst
+++ b/Help/generator/Visual Studio 10 2010.rst
@@ -4,7 +4,7 @@ Visual Studio 10 2010
Generates Visual Studio 10 (VS 2010) project files.
The :variable:`CMAKE_GENERATOR_PLATFORM` variable may be set
-to specify a target platform name.
+to specify a target platform name (architecture).
For compatibility with CMake versions prior to 3.1, one may specify
a target platform name optionally at the end of this generator name:
diff --git a/Help/generator/Visual Studio 11 2012.rst b/Help/generator/Visual Studio 11 2012.rst
index 5fa7f2c..2f1e729 100644
--- a/Help/generator/Visual Studio 11 2012.rst
+++ b/Help/generator/Visual Studio 11 2012.rst
@@ -4,7 +4,7 @@ Visual Studio 11 2012
Generates Visual Studio 11 (VS 2012) project files.
The :variable:`CMAKE_GENERATOR_PLATFORM` variable may be set
-to specify a target platform name.
+to specify a target platform name (architecture).
For compatibility with CMake versions prior to 3.1, one may specify
a target platform name optionally at the end of this generator name:
diff --git a/Help/generator/Visual Studio 12 2013.rst b/Help/generator/Visual Studio 12 2013.rst
index 2c3b119..6e8545b 100644
--- a/Help/generator/Visual Studio 12 2013.rst
+++ b/Help/generator/Visual Studio 12 2013.rst
@@ -4,7 +4,7 @@ Visual Studio 12 2013
Generates Visual Studio 12 (VS 2013) project files.
The :variable:`CMAKE_GENERATOR_PLATFORM` variable may be set
-to specify a target platform name.
+to specify a target platform name (architecture).
For compatibility with CMake versions prior to 3.1, one may specify
a target platform name optionally at the end of this generator name:
diff --git a/Help/generator/Visual Studio 14 2015.rst b/Help/generator/Visual Studio 14 2015.rst
index b35997a..707caf9 100644
--- a/Help/generator/Visual Studio 14 2015.rst
+++ b/Help/generator/Visual Studio 14 2015.rst
@@ -4,7 +4,7 @@ Visual Studio 14 2015
Generates Visual Studio 14 (VS 2015) project files.
The :variable:`CMAKE_GENERATOR_PLATFORM` variable may be set
-to specify a target platform name.
+to specify a target platform name (architecture).
For compatibility with CMake versions prior to 3.1, one may specify
a target platform name optionally at the end of this generator name:
diff --git a/Help/generator/Visual Studio 15.rst b/Help/generator/Visual Studio 15.rst
index 2b9e33a..ae456eb 100644
--- a/Help/generator/Visual Studio 15.rst
+++ b/Help/generator/Visual Studio 15.rst
@@ -4,7 +4,7 @@ Visual Studio 15
Generates Visual Studio 15 project files.
The :variable:`CMAKE_GENERATOR_PLATFORM` variable may be set
-to specify a target platform name.
+to specify a target platform name (architecture).
For compatibility with CMake versions prior to 3.1, one may specify
a target platform name optionally at the end of this generator name:
diff --git a/Help/manual/OPTIONS_BUILD.txt b/Help/manual/OPTIONS_BUILD.txt
index b428a74..fa0e4c1 100644
--- a/Help/manual/OPTIONS_BUILD.txt
+++ b/Help/manual/OPTIONS_BUILD.txt
@@ -66,10 +66,12 @@
Specify platform name if supported by generator.
Some CMake generators support a platform name to be given to the
- native build system to choose a compiler or SDK. This is supported only on
- specific generators::
+ native build system to choose a compiler or SDK. See the
+ :variable:`CMAKE_GENERATOR_PLATFORM` variable.
+ This is supported only on specific generators:
- Visual Studio >= 8
+ * For :ref:`Visual Studio Generators` with VS 2005 and above this
+ specifies the target architecture.
See native build system documentation for allowed platform names.
-----------------------------------------------------------------------
Summary of changes:
Help/generator/Visual Studio 10 2010.rst | 2 +-
Help/generator/Visual Studio 11 2012.rst | 2 +-
Help/generator/Visual Studio 12 2013.rst | 2 +-
Help/generator/Visual Studio 14 2015.rst | 2 +-
Help/generator/Visual Studio 15.rst | 2 +-
Help/manual/OPTIONS_BUILD.txt | 8 +++++---
6 files changed, 10 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list