summaryrefslogtreecommitdiffstats
path: root/Source/CPack
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-08-03 15:06:06 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-08-03 15:06:45 (GMT)
commita3ddcdb9111f81771dc2c06d88de84fc1cf00e00 (patch)
tree7b1729ee1578368c6e6967c94301b06079f54ca5 /Source/CPack
parent1524505e12290e9f4bd9155a6f2e45879d3cb9e5 (diff)
parent795e406e3bbd99024652f44fc121f36cd291c269 (diff)
downloadCMake-a3ddcdb9111f81771dc2c06d88de84fc1cf00e00.zip
CMake-a3ddcdb9111f81771dc2c06d88de84fc1cf00e00.tar.gz
CMake-a3ddcdb9111f81771dc2c06d88de84fc1cf00e00.tar.bz2
Merge topic 'nsis_ignore_license_page'
795e406e3b CPack/NSIS: Add option to not display license page Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6422
Diffstat (limited to 'Source/CPack')
-rw-r--r--Source/CPack/cmCPackNSISGenerator.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx
index 0379232..395b1df 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -235,6 +235,13 @@ int cmCPackNSISGenerator::PackageFiles()
brandingTextCode.c_str());
}
+ if (!this->IsSet("CPACK_NSIS_IGNORE_LICENSE_PAGE")) {
+ std::string licenceCode =
+ cmStrCat("!insertmacro MUI_PAGE_LICENSE \"",
+ this->GetOption("CPACK_RESOURCE_FILE_LICENSE"), "\"\n");
+ this->SetOptionIfNotSet("CPACK_NSIS_LICENSE_PAGE", licenceCode.c_str());
+ }
+
// Setup all of the component sections
if (this->Components.empty()) {
this->SetOptionIfNotSet("CPACK_NSIS_INSTALLATION_TYPES", "");