[Cmake-commits] CMake branch, next, updated. v3.0.0-4180-g5d14a03

[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  5d14a037105ba9074afab1b134af91aa8edeabd0 (commit)
       via  a3ac67cc3f8d9b4df9c93f65db28c494c8883811 (commit)
      from  d084dfd112cf51e8865cef42b7a6388a229b4b10 (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=5d14a037105ba9074afab1b134af91aa8edeabd0
commit 5d14a037105ba9074afab1b134af91aa8edeabd0
Merge: d084dfd a3ac67c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 10 12:54:37 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 10 12:54:37 2014 -0400

    Merge topic 'install-cfbundle-directory' into next
    
    a3ac67cc OS X: Install CFBundles as complete directories


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3ac67cc3f8d9b4df9c93f65db28c494c8883811
commit a3ac67cc3f8d9b4df9c93f65db28c494c8883811
Author:     Tim Blechmann <tim at klingt.org>
AuthorDate: Wed Jul 9 20:01:11 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 10 12:54:10 2014 -0400

    OS X: Install CFBundles as complete directories
    
    Install CFBundles as directories just like frameworks and application
    bundles.

diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 7a39f45..38d369e 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -213,6 +213,20 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       filesFrom.push_back(from1);
       filesTo.push_back(to1);
       }
+    else if(this->Target->IsCFBundleOnApple())
+      {
+      // Install the whole app bundle directory.
+      type = cmInstallType_DIRECTORY;
+      literal_args += " USE_SOURCE_PERMISSIONS";
+
+      std::string targetNameBase = targetName.substr(0, targetName.find('/'));
+
+      std::string from1 = fromDirConfig + targetNameBase;
+      std::string to1 = toDir + targetName;
+
+      filesFrom.push_back(from1);
+      filesTo.push_back(to1);
+      }
     else
       {
       bool haveNamelink = false;

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

Summary of changes:


hooks/post-receive
-- 
CMake