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 8c30014982345567b80ec0dad6bd9eb40dfda505 (commit)
via cbd1d42b34bf83ca24de1b98c5963a2941206300 (commit)
via 0f8522a6c9c00afc67c367de1e1c3f601f1996e9 (commit)
via a43f44000d12c1357eeed04e5a02d11236730dfa (commit)
via df3b007d7f904f8de5877f3e05b629239af7220a (commit)
via e872744990f48777a1f1cebc791911363515092d (commit)
via 0271a5f9ba3a8aa2b2e0a7d94a53ad3f9bb52a00 (commit)
via 1d662e4806364172ebf76099c2d016efd414c74a (commit)
via 4f6940df8c69053b4451056ebf3ebdc8f97bf356 (commit)
via d7866c52c9fc7f28990337a965e8d9e6652b0ac5 (commit)
via 0374abdb18135bfb9f1b88c8f6be17c160fb8b4a (commit)
via 5b0a46e1c93f99c8ba5fadbc3224a3721d95aa64 (commit)
via 802dbe52399dd2330020b94d12e594b46f85e70a (commit)
from b4d3e7a7b0b4b9bdff55249633d902a35f26c02a (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=8c30014982345567b80ec0dad6bd9eb40dfda505
commit 8c30014982345567b80ec0dad6bd9eb40dfda505
Merge: b4d3e7a cbd1d42
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Aug 22 10:37:55 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Aug 22 10:37:55 2014 -0400
Merge topic 'vs-masm'
cbd1d42b Help: Add notes for topic 'vs-masm'
0f8522a6 VS: Add MASM support to VS 8 and 9 (#8170, #14984)
a43f4400 VS: Move internal MasmEnabled member up to VS 7 generator
df3b007d VS: Add test for MASM support
e8727449 VS: Populate MASM tool build settings in .vcxproj files
0271a5f9 VS: Manually fix MASM flag table entries
1d662e48 VS: Generate MASM flag tables from MSBuild tool files
4f6940df VS: Fix ASM_MASM support in VS >= 10
d7866c52 ASM_MASM: Fix selection of ml64
0374abdb ASM_MASM: Add preprocessor definitions to compile lines
5b0a46e1 ASM_MASM: Do not require compiler to be a full path
802dbe52 cmLocalVisualStudio7Generator: Rename local 'lang' var
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/vs-masm.rst | 5 ++
Modules/CMakeASM_MASMInformation.cmake | 2 +-
Modules/CMakeDetermineASM_MASMCompiler.cmake | 3 +-
Source/cmGlobalGenerator.cxx | 3 +-
Source/cmGlobalVisualStudio10Generator.cxx | 10 ---
Source/cmGlobalVisualStudio10Generator.h | 4 --
Source/cmGlobalVisualStudio7Generator.cxx | 1 +
Source/cmGlobalVisualStudio7Generator.h | 4 ++
Source/cmGlobalVisualStudio8Generator.cxx | 8 +++
Source/cmLocalVisualStudio7Generator.cxx | 57 ++++++++++++++-
Source/cmVS10MASMFlagTable.h | 96 ++++++++++++++++++++++++++
Source/cmVS11MASMFlagTable.h | 96 ++++++++++++++++++++++++++
Source/cmVS12MASMFlagTable.h | 96 ++++++++++++++++++++++++++
Source/cmVS14MASMFlagTable.h | 96 ++++++++++++++++++++++++++
Source/cmVisualStudio10TargetGenerator.cxx | 94 ++++++++++++++++++++++++-
Source/cmVisualStudio10TargetGenerator.h | 6 ++
Source/cmVisualStudioGeneratorOptions.h | 1 +
Tests/CMakeLists.txt | 8 +++
Tests/VSMASM/CMakeLists.txt | 10 +++
Tests/VSMASM/foo.asm | 7 ++
Tests/VSMASM/include/foo-proc.asm | 4 ++
Tests/VSMASM/main.c | 2 +
22 files changed, 592 insertions(+), 21 deletions(-)
create mode 100644 Help/release/dev/vs-masm.rst
create mode 100644 Source/cmVS10MASMFlagTable.h
create mode 100644 Source/cmVS11MASMFlagTable.h
create mode 100644 Source/cmVS12MASMFlagTable.h
create mode 100644 Source/cmVS14MASMFlagTable.h
create mode 100644 Tests/VSMASM/CMakeLists.txt
create mode 100644 Tests/VSMASM/foo.asm
create mode 100644 Tests/VSMASM/include/foo-proc.asm
create mode 100644 Tests/VSMASM/main.c
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
