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, master has been updated
via a8513d8a80dbf654915a3176673e7f7ef544a957 (commit)
via d079e71c290c3c55a2db5180953daf014a964c25 (commit)
via 779939a00ebc21419404737f2fc2b34e7775f086 (commit)
from eb923da2c41ab811a6adec44ef87f3aa8bd26849 (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=a8513d8a80dbf654915a3176673e7f7ef544a957
commit a8513d8a80dbf654915a3176673e7f7ef544a957
Merge: eb923da d079e71
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Oct 14 09:25:34 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Oct 14 09:25:34 2016 -0400
Merge topic 'vs-host-x64-tools'
d079e71c VS: Provide an option to use x64 host tools
779939a0 Help: Document VS and Xcode toolset selection
-----------------------------------------------------------------------
Summary of changes:
Help/generator/VS_TOOLSET_HOST_ARCH.txt | 10 ++++++
Help/generator/Visual Studio 10 2010.rst | 7 ++++
Help/generator/Visual Studio 11 2012.rst | 7 ++++
Help/generator/Visual Studio 12 2013.rst | 9 +++++
Help/generator/Visual Studio 14 2015.rst | 9 +++++
Help/generator/Visual Studio 15.rst | 9 +++++
Help/generator/Xcode.rst | 7 ++++
Help/manual/OPTIONS_BUILD.txt | 11 +++---
Help/manual/cmake-variables.7.rst | 1 +
Help/release/dev/vs-host-x64-tools.rst | 7 ++++
...CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst | 10 ++++++
Modules/CMakeDetermineCompilerId.cmake | 5 +++
Modules/CompilerId/VS-10.vcxproj.in | 3 ++
Source/cmGlobalVisualStudio10Generator.cxx | 37 +++++++++++++++++++-
Source/cmGlobalVisualStudio10Generator.h | 5 +++
Source/cmGlobalVisualStudio12Generator.cxx | 15 ++++++++
Source/cmGlobalVisualStudio12Generator.h | 3 ++
Source/cmGlobalXCodeGenerator.cxx | 13 +++++++
Source/cmVisualStudio10TargetGenerator.cxx | 9 +++++
.../BadToolsetHostArch-result.txt} | 0
.../GeneratorToolset/BadToolsetHostArch-stderr.txt | 10 ++++++
.../BadToolsetHostArch.cmake} | 0
Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake | 15 ++++++++
.../TestToolsetHostArchBoth-stdout.txt | 2 ++
.../GeneratorToolset/TestToolsetHostArchBoth.cmake | 2 ++
.../TestToolsetHostArchNone-stdout.txt | 2 ++
.../GeneratorToolset/TestToolsetHostArchNone.cmake | 2 ++
.../TestToolsetHostArchOnly-stdout.txt | 2 ++
.../GeneratorToolset/TestToolsetHostArchOnly.cmake | 2 ++
29 files changed, 207 insertions(+), 7 deletions(-)
create mode 100644 Help/generator/VS_TOOLSET_HOST_ARCH.txt
create mode 100644 Help/release/dev/vs-host-x64-tools.rst
create mode 100644
Help/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst
copy Tests/RunCMake/{Android/BadSYSROOT-result.txt =>
GeneratorToolset/BadToolsetHostArch-result.txt} (100%)
create mode 100644
Tests/RunCMake/GeneratorToolset/BadToolsetHostArch-stderr.txt
copy Tests/RunCMake/{GeneratorPlatform/BadPlatform.cmake =>
GeneratorToolset/BadToolsetHostArch.cmake} (100%)
create mode 100644
Tests/RunCMake/GeneratorToolset/TestToolsetHostArchBoth-stdout.txt
create mode 100644
Tests/RunCMake/GeneratorToolset/TestToolsetHostArchBoth.cmake
create mode 100644
Tests/RunCMake/GeneratorToolset/TestToolsetHostArchNone-stdout.txt
create mode 100644
Tests/RunCMake/GeneratorToolset/TestToolsetHostArchNone.cmake
create mode 100644
Tests/RunCMake/GeneratorToolset/TestToolsetHostArchOnly-stdout.txt
create mode 100644
Tests/RunCMake/GeneratorToolset/TestToolsetHostArchOnly.cmake
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
