summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-08-09 13:20:13 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-08-09 13:20:13 (GMT)
commit892ffe4ebd5ca0fd36255671efe37edc9448b470 (patch)
treebbdf63af13c49f03f675acdc8754a166387a9137 /Modules
parent982b4cd602fc125c9d2165145100d5e574644bf9 (diff)
parent17bbf6af1ecca15194a693d31fdd8163aacfd994 (diff)
downloadCMake-892ffe4ebd5ca0fd36255671efe37edc9448b470.zip
CMake-892ffe4ebd5ca0fd36255671efe37edc9448b470.tar.gz
CMake-892ffe4ebd5ca0fd36255671efe37edc9448b470.tar.bz2
Merge topic 'wix-custom-install-dir'
17bbf6af CPackWIX: Implement new CPACK_WIX_SKIP_PROGRAM_FOLDER feature
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CPackWIX.cmake17
1 files changed, 17 insertions, 0 deletions
diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake
index 10926c0..08ff0cb 100644
--- a/Modules/CPackWIX.cmake
+++ b/Modules/CPackWIX.cmake
@@ -248,6 +248,23 @@
# Sets the description of the root install feature in the WIX installer. Same as
# CPACK_COMPONENT_<compName>_DESCRIPTION for components.
#
+# .. variable:: CPACK_WIX_SKIP_PROGRAM_FOLDER
+#
+# If this variable is set to true, the default install location
+# of the generated package will be CPACK_PACKAGE_INSTALL_DIRECTORY directly.
+# The install location will not be located relatively below
+# ProgramFiles or ProgramFiles64.
+#
+# .. note::
+# Installers created with this feature do not take differences
+# between the system on which the installer is created
+# and the system on which the installer might be used into account.
+#
+# It is therefor possible that the installer e.g. might try to install
+# onto a drive that is unavailable or unintended or a path that does not
+# follow the localization or convention of the system on which the
+# installation is performed.
+#
#=============================================================================
# Copyright 2014-2015 Kitware, Inc.