[Cmake-commits] CMake branch, master, updated. v3.6.0-rc1-56-g8632251

[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  8632251b25c217e12ae8741e935d6b9aa03ac04b (commit)
       via  188baef00c3b19c6ee6ed8c3735817bae50f110e (commit)
      from  5572f5fffd040473c588215a7c87a12530e1548e (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=8632251b25c217e12ae8741e935d6b9aa03ac04b
commit 8632251b25c217e12ae8741e935d6b9aa03ac04b
Merge: 5572f5f 188baef
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 8 12:56:00 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 8 12:56:00 2016 -0400

    Merge topic 'find_path-in-framework'
    
    188baef0 find_path: Fix location of <dir/header.h> in a framework on OS X


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

Summary of changes:
 Source/cmFindPathCommand.cxx                                       |    2 +-
 .../find_path/Frameworks/Foo.framework/Headers/Some/Dir}/Header.h  |    0
 Tests/RunCMake/find_path/FrameworksWithSubdirs-stdout.txt          |    1 +
 Tests/RunCMake/find_path/FrameworksWithSubdirs.cmake               |    3 +++
 Tests/RunCMake/find_path/RunCMakeTest.cmake                        |    4 ++++
 5 files changed, 9 insertions(+), 1 deletion(-)
 copy Tests/{VSWindowsFormsResx/WindowsFormsResx => RunCMake/find_path/Frameworks/Foo.framework/Headers/Some/Dir}/Header.h (100%)
 create mode 100644 Tests/RunCMake/find_path/FrameworksWithSubdirs-stdout.txt
 create mode 100644 Tests/RunCMake/find_path/FrameworksWithSubdirs.cmake


hooks/post-receive
-- 
CMake