[Cmake-commits] CMake branch, master, updated. v3.4.0-531-g30b0db7

[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  30b0db7bb5482258ccdb96d2f0b7aadb5d3b23ac (commit)
       via  f6f03ed4cc4271384ec934fd5867ccbce4e798f2 (commit)
       via  9f053763d769780385fbc8e3e936f1c996d2e00a (commit)
      from  166a61c72986a45814c524f178857207f3cc113e (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=30b0db7bb5482258ccdb96d2f0b7aadb5d3b23ac
commit 30b0db7bb5482258ccdb96d2f0b7aadb5d3b23ac
Merge: 166a61c f6f03ed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 16 09:22:46 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 16 09:22:46 2015 -0500

    Merge topic 'non-xcode-framework-layout'
    
    f6f03ed4 Add test for OSX/iOS Framework directory structure (#15833)
    9f053763 Fix iOS Framework directory structure (#15833)


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

Summary of changes:
 Source/cmOSXBundleGenerator.cxx                    |   15 +++++++--
 Tests/RunCMake/CMakeLists.txt                      |    6 ++++
 .../{AutoExportDll => Framework}/CMakeLists.txt    |    2 +-
 Tests/RunCMake/Framework/FrameworkLayout.cmake     |    5 +++
 .../Framework/OSXFrameworkLayout-build-check.cmake |   20 ++++++++++++
 Tests/RunCMake/Framework/RunCMakeTest.cmake        |   33 ++++++++++++++++++++
 Tests/RunCMake/Framework/foo.c                     |    1 +
 .../Framework/iOSFrameworkLayout-build-check.cmake |   20 ++++++++++++
 Tests/RunCMake/Framework/ios.cmake                 |   25 +++++++++++++++
 .../RunCMake/{XcodeProject => Framework}/osx.cmake |    0
 10 files changed, 123 insertions(+), 4 deletions(-)
 copy Tests/RunCMake/{AutoExportDll => Framework}/CMakeLists.txt (63%)
 create mode 100644 Tests/RunCMake/Framework/FrameworkLayout.cmake
 create mode 100644 Tests/RunCMake/Framework/OSXFrameworkLayout-build-check.cmake
 create mode 100644 Tests/RunCMake/Framework/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/Framework/foo.c
 create mode 100644 Tests/RunCMake/Framework/iOSFrameworkLayout-build-check.cmake
 create mode 100644 Tests/RunCMake/Framework/ios.cmake
 copy Tests/RunCMake/{XcodeProject => Framework}/osx.cmake (100%)


hooks/post-receive
-- 
CMake