Merge branch 'install-cfbundle-directory' into release
This commit is contained in:
commit
6e9454dd7e
@ -210,6 +210,20 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
|
|||||||
// Tweaks apply to the binary inside the bundle.
|
// Tweaks apply to the binary inside the bundle.
|
||||||
std::string to1 = toDir + targetNameReal;
|
std::string to1 = toDir + targetNameReal;
|
||||||
|
|
||||||
|
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);
|
filesFrom.push_back(from1);
|
||||||
filesTo.push_back(to1);
|
filesTo.push_back(to1);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user