[Cmake-commits] CMake branch, next, updated. v3.0.0-4174-gde47322

[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  de47322e69c37221b19f85b0a490a77a2e1646ec (commit)
       via  908433bd1d335ed37a8c48d6d13a94188120ca89 (commit)
       via  7e5c9c152677d397d03b8573f16225359171201a (commit)
      from  cd2351a279d2cd5ad5a46f9c3680e4beebde42f6 (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=de47322e69c37221b19f85b0a490a77a2e1646ec
commit de47322e69c37221b19f85b0a490a77a2e1646ec
Merge: cd2351a 908433b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 10 09:14:10 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 10 09:14:10 2014 -0400

    Merge topic 'install-cfbundle-directory' into next
    
    908433bd OS X: Install CFBundles as complete directories
    7e5c9c15 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=908433bd1d335ed37a8c48d6d13a94188120ca89
commit 908433bd1d335ed37a8c48d6d13a94188120ca89
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 09:13:14 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 85df91d..8a1c53e 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -215,6 +215,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:
 Source/CMakeVersion.cmake           |    2 +-
 Source/cmInstallTargetGenerator.cxx |   14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake