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 fd1f119877d70c15ff420b7ae63d6a518386aeaf (commit)
via 7490ae768d8e709a7778ae25a13484e8fd09871c (commit)
from 2b1e5125bb08ba16a8c9a18a48adc67a4df0b8d7 (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=fd1f119877d70c15ff420b7ae63d6a518386aeaf
commit fd1f119877d70c15ff420b7ae63d6a518386aeaf
Merge: 2b1e512 7490ae7
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Oct 14 09:22:19 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Oct 14 09:22:19 2016 -0400
Merge topic 'vs-host-x64-tools' into next
7490ae76 fixup! VS: Provide an option to use x64 host tools
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7490ae768d8e709a7778ae25a13484e8fd09871c
commit 7490ae768d8e709a7778ae25a13484e8fd09871c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Oct 14 09:21:40 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Oct 14 09:21:40 2016 -0400
fixup! VS: Provide an option to use x64 host tools
diff --git a/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst
b/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst
index 2af3a93..4c04e97 100644
--- a/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst
+++ b/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst
@@ -1,12 +1,10 @@
CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE
-------------------------------------------
-Visual Studio preferred tool architecture (``x64`` or empty).
+Visual Studio preferred tool architecture.
The :ref:`Visual Studio Generators` for VS 2013 and above support optional
selection of a 64-bit toolchain on 64-bit hosts by specifying a ``host=64``
-value in the :variable:`CMAKE_GENERATOR_TOOLSET` option. The value of this
-variable indicates the selected toolchain architecture preference. Note
-that this is only a preference specified in the generated project files.
-MSBuild may still choose a different tool architecture, such as when on
-a 32-bit host.
+value in the :variable:`CMAKE_GENERATOR_TOOLSET` option. CMake provides
+the selected toolchain architecture preference in this variable (either
+``x64`` or empty).
-----------------------------------------------------------------------
Summary of changes:
.../variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
