[Cmake-commits] CMake branch, master, updated. v3.0.0-rc5-896-g567ca4c

[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  567ca4c79ecfa5665c475d9176d682908bade012 (commit)
       via  a339ea652952666182d2e63ddce088d023e2a5f5 (commit)
       via  ae80cb9f28c8c278a6897f331f65a1be77058897 (commit)
      from  57151fba6a66513237ab8de36a6b723007c5570a (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=567ca4c79ecfa5665c475d9176d682908bade012
commit 567ca4c79ecfa5665c475d9176d682908bade012
Merge: 57151fb a339ea6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 16 10:21:06 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 16 10:21:06 2014 -0400

    Merge topic 'xcode-file-type'
    
    a339ea65 Xcode: Add source file property to control file type (#14854)
    ae80cb9f Xcode: Refactor internal source file type selection


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

Summary of changes:
 Help/manual/cmake-properties.7.rst                 |    2 +
 Help/prop_sf/XCODE_EXPLICIT_FILE_TYPE.rst          |    8 ++
 Help/prop_sf/XCODE_LAST_KNOWN_FILE_TYPE.rst        |    9 +++
 Help/release/dev/xcode-file-type.rst               |    7 ++
 Source/cmGlobalXCodeGenerator.cxx                  |   77 ++++++++++++--------
 Source/cmGlobalXCodeGenerator.h                    |    6 +-
 Tests/RunCMake/CMakeLists.txt                      |    4 +
 .../{CMP0004 => XcodeProject}/CMakeLists.txt       |    0
 Tests/RunCMake/XcodeProject/RunCMakeTest.cmake     |    3 +
 .../XcodeProject/XcodeFileType-check.cmake         |   10 +++
 Tests/RunCMake/XcodeProject/XcodeFileType.cmake    |    4 +
 .../hello.f => Tests/RunCMake/XcodeProject/main.c  |    0
 .../RunCMake/XcodeProject/src-default              |    0
 .../RunCMake/XcodeProject/src-explicit             |    0
 .../RunCMake/XcodeProject/src-lastKnown            |    0
 15 files changed, 97 insertions(+), 33 deletions(-)
 create mode 100644 Help/prop_sf/XCODE_EXPLICIT_FILE_TYPE.rst
 create mode 100644 Help/prop_sf/XCODE_LAST_KNOWN_FILE_TYPE.rst
 create mode 100644 Help/release/dev/xcode-file-type.rst
 copy Tests/RunCMake/{CMP0004 => XcodeProject}/CMakeLists.txt (100%)
 create mode 100644 Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeFileType-check.cmake
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeFileType.cmake
 copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/XcodeProject/main.c (100%)
 copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/XcodeProject/src-default (100%)
 copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/XcodeProject/src-explicit (100%)
 copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/XcodeProject/src-lastKnown (100%)


hooks/post-receive
-- 
CMake