[Cmake-commits] CMake branch, next, updated. v3.2.1-1376-gc6dd116

[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, next has been updated
       via  c6dd1161e1b558c364db187ea60e83ae42c98846 (commit)
       via  078c732185ff610c55707ae66be0a787c78bd2e2 (commit)
      from  4f51a06046cb500c742a97a25bf5c7a83ac474bb (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=c6dd1161e1b558c364db187ea60e83ae42c98846
commit c6dd1161e1b558c364db187ea60e83ae42c98846
Merge: 4f51a06 078c732
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 1 15:41:30 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 1 15:41:30 2015 -0400

    Merge topic 'xcode-source-type-metal' into next
    
    078c7321 Xcode: Add file type for Metal shader files


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=078c732185ff610c55707ae66be0a787c78bd2e2
commit 078c732185ff610c55707ae66be0a787c78bd2e2
Author:     Sean James <seanjames777 at gmail.com>
AuthorDate: Wed Apr 1 15:02:42 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 1 15:15:22 2015 -0400

    Xcode: Add file type for Metal shader files

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index f139ad1..5e584a4 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -865,6 +865,10 @@ GetSourcecodeValueFromFileExtension(const std::string& _ext,
     {
     sourcecode += ".asm";
     }
+  else if (ext == "metal")
+    {
+    sourcecode += ".metal";
+    }
   //else
   //  {
   //  // Already specialized above or we leave sourcecode == "sourcecode"

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

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake