[Cmake-commits] CMake branch, master, updated. v3.4.1-695-ga680211

[Brad King]

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  a680211ca782751159d70464e51eac812d8db8f1 (commit)
       via  565d080a9a1e133bda868e905226181b60e90356 (commit)
       via  34f5ef564aa94f2f66f35c708dbfca260b419e4b (commit)
      from  53930877b3e8ae356a6b1dfbb1c63c92e7383465 (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=a680211ca782751159d70464e51eac812d8db8f1
commit a680211ca782751159d70464e51eac812d8db8f1
Merge: 5393087 565d080
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 11 09:47:18 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 11 09:47:18 2015 -0500

    Merge topic 'ios-universal'
    
    565d080a Xcode: Add support for combined install on iOS
    34f5ef56 iOS: Fix App Bundle layout


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

Summary of changes:
 Help/manual/cmake-properties.7.rst                 |    1 +
 Help/manual/cmake-variables.7.rst                  |    1 +
 Help/prop_tgt/IOS_INSTALL_COMBINED.rst             |   11 +
 Help/release/dev/ios-universal.rst                 |    7 +
 Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst       |    8 +
 Modules/CMakeIOSInstallCombined.cmake              |  297 ++++++++++++++++++++
 Source/cmInstallTargetGenerator.cxx                |   52 +++-
 Source/cmInstallTargetGenerator.h                  |    2 +
 Source/cmTarget.cxx                                |    1 +
 Tests/RunCMake/XcodeProject/RunCMakeTest.cmake     |   36 +++
 .../XcodeIOSInstallCombined-install-check.cmake    |   30 ++
 .../XcodeProject/XcodeIOSInstallCombined.cmake     |   27 ++
 ...codeIOSInstallCombinedPrune-install-check.cmake |   26 ++
 ...XcodeIOSInstallCombinedPrune-install-stdout.txt |    2 +
 .../XcodeIOSInstallCombinedPrune.cmake             |   36 +++
 Tests/RunCMake/XcodeProject/{main.m => main.cpp}   |    2 +-
 16 files changed, 537 insertions(+), 2 deletions(-)
 create mode 100644 Help/prop_tgt/IOS_INSTALL_COMBINED.rst
 create mode 100644 Help/release/dev/ios-universal.rst
 create mode 100644 Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst
 create mode 100644 Modules/CMakeIOSInstallCombined.cmake
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune-install-check.cmake
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune-install-stdout.txt
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune.cmake
 copy Tests/RunCMake/XcodeProject/{main.m => main.cpp} (75%)


hooks/post-receive
-- 
CMake