[Cmake-commits] CMake branch, next, updated. v3.0.1-5122-g43ad355

[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  43ad355eef79c4400b518c0d66b0d64317574575 (commit)
       via  8eacc3390a2b9a9fb6e5df2cec9b9b8da0354961 (commit)
       via  02aa5965e6b4b82b5e8b893beadc56069d4a7ebb (commit)
      from  e2653ca3747f5c1eed6343a9c7aac02e2fc0d265 (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=43ad355eef79c4400b518c0d66b0d64317574575
commit 43ad355eef79c4400b518c0d66b0d64317574575
Merge: e2653ca 8eacc33
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 3 10:43:12 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 3 10:43:12 2014 -0400

    Merge topic 'xcode-assetcatalog-folder-type' into next
    
    8eacc339 Xcode: Reference '.xcassets' folders as assetcatalog (#15125)
    02aa5965 Xcode: Refactor internal file type extension extraction


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8eacc3390a2b9a9fb6e5df2cec9b9b8da0354961
commit 8eacc3390a2b9a9fb6e5df2cec9b9b8da0354961
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 3 10:33:50 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 3 10:33:50 2014 -0400

    Xcode: Reference '.xcassets' folders as assetcatalog (#15125)

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 1c3d358..3625449 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -877,7 +877,7 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
     // (Xcode 4.6 does not like explicitFileType=folder).
     if(cmSystemTools::FileIsDirectory(fullpath.c_str()))
       {
-      fileType = "folder";
+      fileType = (ext == "xcassets"? "folder.assetcatalog" : "folder");
       useLastKnownFileType = true;
       }
     else

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02aa5965e6b4b82b5e8b893beadc56069d4a7ebb
commit 02aa5965e6b4b82b5e8b893beadc56069d4a7ebb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 3 10:33:12 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 3 10:33:12 2014 -0400

    Xcode: Refactor internal file type extension extraction
    
    Move it earlier so it can be used for directories too.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index ee5fc00..1c3d358 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -864,6 +864,13 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
     }
   if(fileType.empty())
     {
+    // Compute the extension without leading '.'.
+    std::string ext = cmSystemTools::GetFilenameLastExtension(fullpath);
+    if(!ext.empty())
+      {
+      ext = ext.substr(1);
+      }
+
     // If fullpath references a directory, then we need to specify
     // lastKnownFileType as folder in order for Xcode to be able to
     // open the contents of the folder.
@@ -875,13 +882,6 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
       }
     else
       {
-      // Compute the extension without leading '.'.
-      std::string ext = cmSystemTools::GetFilenameLastExtension(fullpath);
-      if(!ext.empty())
-        {
-        ext = ext.substr(1);
-        }
-
       fileType = GetSourcecodeValueFromFileExtension(
         ext, lang, useLastKnownFileType);
       }

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

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake