summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-07-10 16:55:45 (GMT)
committerBrad King <brad.king@kitware.com>2014-07-10 16:55:45 (GMT)
commit6e9454dd7e63b0f926f77e0bd641f1edeffce8f2 (patch)
treee4f5e9b0a6411f3c1b3dd4864edce8c84734d6be
parent8df37d6d5e5c1130d410f389fb3746f3aed0ec94 (diff)
parenta3ac67cc3f8d9b4df9c93f65db28c494c8883811 (diff)
downloadCMake-6e9454dd7e63b0f926f77e0bd641f1edeffce8f2.zip
CMake-6e9454dd7e63b0f926f77e0bd641f1edeffce8f2.tar.gz
CMake-6e9454dd7e63b0f926f77e0bd641f1edeffce8f2.tar.bz2
Merge branch 'install-cfbundle-directory' into release
-rw-r--r--Source/cmInstallTargetGenerator.cxx14
1 files changed, 14 insertions, 0 deletions
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;