[Cmake-commits] CMake branch, master, updated. v3.8.0-rc1-117-g160083b
Brad King
brad.king at kitware.com
Thu Feb 16 13:15:51 EST 2017
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 160083b04ddde9904e90cbf8146193e28eb58124 (commit)
via f773933f2630a17ce6b3b2aa6f8d7d8b65eb336c (commit)
via d9e2b9a909b5f5b51ef3a106ed1d60a8d4cb795a (commit)
from fb3fd78d580d0ad0aa138fd8edd7f81f44a3f275 (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=160083b04ddde9904e90cbf8146193e28eb58124
commit 160083b04ddde9904e90cbf8146193e28eb58124
Merge: fb3fd78 f773933
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 16 13:15:49 2017 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 16 13:15:49 2017 -0500
Merge topic 'vs-refactor-toolset-parsing'
f773933f VS: Refactor generator toolset parsing
d9e2b9a9 Tests: Split out RunCMake.GeneratorToolset Xcode checks
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalVisualStudio10Generator.cxx | 82 ++++++++++++++++----
Source/cmGlobalVisualStudio10Generator.h | 6 +-
Source/cmGlobalVisualStudio12Generator.cxx | 16 ++--
Source/cmGlobalVisualStudio12Generator.h | 4 +-
.../BadToolsetFormat-result.txt} | 0
.../GeneratorToolset/BadToolsetFormat-stderr.txt | 10 +++
.../BadToolsetFormat.cmake} | 0
.../GeneratorToolset/BadToolsetHostArch-stderr.txt | 4 +-
.../BadToolsetHostArchTwice-result.txt} | 0
.../BadToolsetHostArchTwice-stderr.txt | 10 +++
.../BadToolsetHostArchTwice.cmake} | 0
.../BadToolsetHostArchXcode-result.txt} | 0
...derr.txt => BadToolsetHostArchXcode-stderr.txt} | 0
.../BadToolsetHostArchXcode.cmake} | 0
Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake | 11 ++-
15 files changed, 114 insertions(+), 29 deletions(-)
copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => GeneratorToolset/BadToolsetFormat-result.txt} (100%)
create mode 100644 Tests/RunCMake/GeneratorToolset/BadToolsetFormat-stderr.txt
copy Tests/RunCMake/{GeneratorPlatform/BadPlatform.cmake => GeneratorToolset/BadToolsetFormat.cmake} (100%)
copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => GeneratorToolset/BadToolsetHostArchTwice-result.txt} (100%)
create mode 100644 Tests/RunCMake/GeneratorToolset/BadToolsetHostArchTwice-stderr.txt
copy Tests/RunCMake/{GeneratorPlatform/BadPlatform.cmake => GeneratorToolset/BadToolsetHostArchTwice.cmake} (100%)
copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => GeneratorToolset/BadToolsetHostArchXcode-result.txt} (100%)
copy Tests/RunCMake/GeneratorToolset/{BadToolsetHostArch-stderr.txt => BadToolsetHostArchXcode-stderr.txt} (100%)
copy Tests/RunCMake/{GeneratorPlatform/BadPlatform.cmake => GeneratorToolset/BadToolsetHostArchXcode.cmake} (100%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list