[Cmake-commits] CMake branch, master, updated. v3.3.2-1214-g3090261

Brad King brad.king at kitware.com
Fri Sep 18 09:56:41 EDT 2015


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  309026147a04d4a4744f6cca50717fe869069fea (commit)
       via  e134e53b47fc9f0337529ce2b6851cec6319a8af (commit)
       via  da00be6359055ffdb2067a9ec1e817eb782ad145 (commit)
       via  d488b5c9764805222d33d50cc070fd4f71aab262 (commit)
       via  6d620f5ad7fc9767a7232659cde1d7c9abf78285 (commit)
      from  732e86ef3ab872c3394730f489bd5a91217fd1ed (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=309026147a04d4a4744f6cca50717fe869069fea
commit 309026147a04d4a4744f6cca50717fe869069fea
Merge: 732e86e e134e53
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 18 09:56:39 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 18 09:56:39 2015 -0400

    Merge topic 'ms-manifest-files'
    
    e134e53b Add support for *.manifest source files with MSVC tools
    da00be63 MSVC: Rewrite manifest file handling with Makefile and Ninja
    d488b5c9 Ninja: Always add OBJECT_DIR variable to link rules
    6d620f5a VS: Add manifest tool settings to VS 8 and 9 project files


-----------------------------------------------------------------------

Summary of changes:
 Help/release/dev/ms-manifest-files.rst             |    7 +
 Modules/Platform/Windows-MSVC.cmake                |    4 +-
 Source/cmCommonTargetGenerator.cxx                 |   17 +
 Source/cmCommonTargetGenerator.h                   |    1 +
 Source/cmGeneratorTarget.cxx                       |   14 +
 Source/cmGeneratorTarget.h                         |    2 +
 Source/cmLocalGenerator.cxx                        |    7 +
 Source/cmLocalGenerator.h                          |    1 +
 Source/cmLocalVisualStudio7Generator.cxx           |   38 +-
 Source/cmMakefileExecutableTargetGenerator.cxx     |    4 +
 Source/cmMakefileLibraryTargetGenerator.cxx        |    4 +
 Source/cmMakefileTargetGenerator.cxx               |    9 +
 Source/cmNinjaNormalTargetGenerator.cxx            |   10 +-
 Source/cmNinjaTargetGenerator.cxx                  |    9 +
 Source/cmVisualStudio10TargetGenerator.cxx         |   29 ++
 Source/cmVisualStudio10TargetGenerator.h           |    1 +
 Source/cmcmd.cxx                                   |  416 +++++++++++---------
 Source/cmcmd.h                                     |   14 -
 Tests/CMakeLists.txt                               |    1 +
 Tests/MSManifest/CMakeLists.txt                    |    5 +
 Tests/MSManifest/Subdir/CMakeLists.txt             |    9 +
 Tests/MSManifest/Subdir/check.cmake                |    6 +
 .../LinkInterfaceLoop => MSManifest/Subdir}/main.c |    0
 Tests/MSManifest/Subdir/test.manifest.in           |    4 +
 Tests/RunCMake/BuildDepends/C-Exe-Manifest.cmake   |   19 +
 .../BuildDepends/C-Exe-Manifest.step1.cmake        |    6 +
 .../BuildDepends/C-Exe-Manifest.step2.cmake        |    6 +
 Tests/RunCMake/BuildDepends/RunCMakeTest.cmake     |   11 +
 Tests/RunCMake/BuildDepends/check.cmake            |    3 +
 .../BuildDepends}/main.c                           |    0
 30 files changed, 444 insertions(+), 213 deletions(-)
 create mode 100644 Help/release/dev/ms-manifest-files.rst
 create mode 100644 Tests/MSManifest/CMakeLists.txt
 create mode 100644 Tests/MSManifest/Subdir/CMakeLists.txt
 create mode 100644 Tests/MSManifest/Subdir/check.cmake
 copy Tests/{CMakeOnly/LinkInterfaceLoop => MSManifest/Subdir}/main.c (100%)
 create mode 100644 Tests/MSManifest/Subdir/test.manifest.in
 create mode 100644 Tests/RunCMake/BuildDepends/C-Exe-Manifest.cmake
 create mode 100644 Tests/RunCMake/BuildDepends/C-Exe-Manifest.step1.cmake
 create mode 100644 Tests/RunCMake/BuildDepends/C-Exe-Manifest.step2.cmake
 copy Tests/{CMakeOnly/LinkInterfaceLoop => RunCMake/BuildDepends}/main.c (100%)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list