summaryrefslogtreecommitdiffstats
path: root/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
diff options
context:
space:
mode:
authorNils Gladitz <nilsgladitz@gmail.com>2014-09-27 15:34:39 (GMT)
committerNils Gladitz <nilsgladitz@gmail.com>2014-09-27 15:34:39 (GMT)
commitd48c781fc2e637fd9605775f44f4360bec6a59d9 (patch)
tree08a190d00835a9fb230fcf3dae6956b19dffabc4 /Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
parent58dc05de9e8e130b0fc188ff510826d649d62aff (diff)
downloadCMake-d48c781fc2e637fd9605775f44f4360bec6a59d9.zip
CMake-d48c781fc2e637fd9605775f44f4360bec6a59d9.tar.gz
CMake-d48c781fc2e637fd9605775f44f4360bec6a59d9.tar.bz2
CPackWiX: Extend CPACK_WIX_ACL to support directories
Diffstat (limited to 'Source/CPack/WiX/cmWIXFilesSourceWriter.cxx')
-rw-r--r--Source/CPack/WiX/cmWIXFilesSourceWriter.cxx10
1 files changed, 9 insertions, 1 deletions
diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
index 0ad5d0c..1adb06a 100644
--- a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
@@ -113,7 +113,9 @@ void cmWIXFilesSourceWriter::EmitUninstallShortcut(
}
std::string cmWIXFilesSourceWriter::EmitComponentCreateFolder(
- std::string const& directoryId, std::string const& guid)
+ std::string const& directoryId,
+ std::string const& guid,
+ cmInstalledFile const* installedFile)
{
std::string componentId =
std::string("CM_C_EMPTY_") + directoryId;
@@ -127,6 +129,12 @@ std::string cmWIXFilesSourceWriter::EmitComponentCreateFolder(
BeginElement("CreateFolder");
+ if(installedFile)
+ {
+ cmWIXAccessControlList acl(Logger, *installedFile, *this);
+ acl.Apply();
+ }
+
EndElement("CreateFolder");
EndElement("Component");
EndElement("DirectoryRef");