[Cmake-commits] CMake branch, master, updated. v3.4.1-617-gd4767fc

[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  d4767fca963e97ec2147a343e24ec366cc2646cb (commit)
       via  e76ee2c006777e268715b39ad71f49e3d18b11a4 (commit)
      from  7410e2ed61851385d0c06dd174a4782a54c44ab0 (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=d4767fca963e97ec2147a343e24ec366cc2646cb
commit d4767fca963e97ec2147a343e24ec366cc2646cb
Merge: 7410e2e e76ee2c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 4 09:54:09 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 4 09:54:09 2015 -0500

    Merge topic 'ios-framework-resource-layout'
    
    e76ee2c0 iOS: Fix framework resource directory layout (#15848)


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

Summary of changes:
 Help/prop_tgt/MACOSX_BUNDLE.rst                    |    2 +-
 Help/prop_tgt/MACOSX_RPATH.rst                     |    6 +-
 Help/prop_tgt/RESOURCE.rst                         |   66 +++++++++++++++++---
 Source/cmGeneratorTarget.cxx                       |    6 +-
 Tests/RunCMake/Framework/FrameworkLayout.cmake     |   10 ++-
 .../Framework/OSXFrameworkLayout-build-check.cmake |   17 ++++-
 Tests/RunCMake/Framework/foo.h                     |    1 +
 .../Framework/iOSFrameworkLayout-build-check.cmake |   17 ++++-
 .../hello.f => Tests/RunCMake/Framework/res.txt    |    0
 9 files changed, 108 insertions(+), 17 deletions(-)
 create mode 100644 Tests/RunCMake/Framework/foo.h
 copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/Framework/res.txt (100%)


hooks/post-receive
-- 
CMake