[Cmake-commits] CMake branch, master, updated. v2.8.11.1-431-g8a08ab0
Brad King
brad.king at kitware.com
Mon Jul 1 09:28:29 EDT 2013
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 8a08ab051a4162539356bdcbc5e7900a84c5816a (commit)
via 9a76d83f6d567516fcfd63ce778072ab4d5c766a (commit)
via 4e5cb398ae392079031ae6a880569349c29770a6 (commit)
via 78fdbbcb4130eedc2cb48ec9e67fad5c2beffb0e (commit)
via e99d7b1c1f9b488b2f6dcf34a4f6c8e8f118b0a7 (commit)
via 77ac9b8b9c56927617aeaabe01b5e8d22eaf4858 (commit)
from 526f1e636ef206f91d04f070f1598cc1c9746e6f (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=8a08ab051a4162539356bdcbc5e7900a84c5816a
commit 8a08ab051a4162539356bdcbc5e7900a84c5816a
Merge: 526f1e6 9a76d83
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 1 09:27:33 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 1 09:27:33 2013 -0400
Merge topic 'vs12-generator'
9a76d83 VS12: Find proper MSBuild for VSProjectInSubdir test
4e5cb39 Merge branch 'master' into vs12-generator
78fdbbc FindBoost: Add -vc120 mangling for VS 12
e99d7b1 VS12: Generate flag tables from MSBuild v120 tool files
77ac9b8 VS12: Add Visual Studio 12 generator (#14251)
-----------------------------------------------------------------------
Summary of changes:
...keVS6FindMake.cmake => CMakeVS12FindMake.cmake} | 20 +++---
Modules/FindBoost.cmake | 2 +
Modules/InstallRequiredSystemLibraries.cmake | 8 ++
Modules/Platform/Windows-MSVC.cmake | 5 +-
Source/CMakeLists.txt | 2 +
Source/cmDocumentVariables.cxx | 3 +-
...tor.cxx => cmGlobalVisualStudio12Generator.cxx} | 72 ++++++++++----------
...nerator.h => cmGlobalVisualStudio12Generator.h} | 18 +++---
Source/cmLocalVisualStudioGenerator.h | 3 +-
.../{cmVS11CLFlagTable.h => cmVS12CLFlagTable.h} | 14 +++-
.../{cmVS11LibFlagTable.h => cmVS12LibFlagTable.h} | 2 +-
...cmVS11LinkFlagTable.h => cmVS12LinkFlagTable.h} | 2 +-
Source/cmVisualStudio10TargetGenerator.cxx | 24 +++++--
Source/cmVisualStudioGeneratorOptions.cxx | 1 +
Source/cmake.cxx | 4 +
Source/cmparseMSBuildXML.py | 3 +
Tests/CMakeLists.txt | 11 ++-
Tests/CheckCompilerRelatedVariables/CMakeLists.txt | 4 +
Tests/Preprocess/CMakeLists.txt | 3 +
Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake | 2 +-
Tests/VSExternalInclude/CMakeLists.txt | 4 +-
21 files changed, 132 insertions(+), 75 deletions(-)
copy Modules/{CMakeVS6FindMake.cmake => CMakeVS12FindMake.cmake} (57%)
copy Source/{cmGlobalVisualStudio11Generator.cxx => cmGlobalVisualStudio12Generator.cxx} (56%)
copy Source/{cmGlobalVisualStudio11Generator.h => cmGlobalVisualStudio12Generator.h} (70%)
copy Source/{cmVS11CLFlagTable.h => cmVS12CLFlagTable.h} (97%)
copy Source/{cmVS11LibFlagTable.h => cmVS12LibFlagTable.h} (98%)
copy Source/{cmVS11LinkFlagTable.h => cmVS12LinkFlagTable.h} (99%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list