|
|
@@ -129,14 +129,13 @@ int cmCPackNSISGenerator::PackageFiles()
|
|
|
this->IsSet("CPACK_NSIS_MUI_UNIICON")) {
|
|
|
std::string installerIconCode;
|
|
|
if (this->IsSet("CPACK_NSIS_MUI_ICON")) {
|
|
|
- installerIconCode += "!define MUI_ICON \"";
|
|
|
- installerIconCode += this->GetOption("CPACK_NSIS_MUI_ICON");
|
|
|
- installerIconCode += "\"\n";
|
|
|
+ installerIconCode += cmStrCat(
|
|
|
+ "!define MUI_ICON \"", this->GetOption("CPACK_NSIS_MUI_ICON"), "\"\n");
|
|
|
}
|
|
|
if (this->IsSet("CPACK_NSIS_MUI_UNIICON")) {
|
|
|
- installerIconCode += "!define MUI_UNICON \"";
|
|
|
- installerIconCode += this->GetOption("CPACK_NSIS_MUI_UNIICON");
|
|
|
- installerIconCode += "\"\n";
|
|
|
+ installerIconCode +=
|
|
|
+ cmStrCat("!define MUI_UNICON \"",
|
|
|
+ this->GetOption("CPACK_NSIS_MUI_UNIICON"), "\"\n");
|
|
|
}
|
|
|
this->SetOptionIfNotSet("CPACK_NSIS_INSTALLER_MUI_ICON_CODE",
|
|
|
installerIconCode.c_str());
|
|
|
@@ -174,6 +173,32 @@ int cmCPackNSISGenerator::PackageFiles()
|
|
|
installerRunCode.c_str());
|
|
|
}
|
|
|
|
|
|
+ if (this->IsSet("CPACK_NSIS_WELCOME_TITLE")) {
|
|
|
+ std::string welcomeTitleCode =
|
|
|
+ cmStrCat("!define MUI_WELCOMEPAGE_TITLE \"",
|
|
|
+ this->GetOption("CPACK_NSIS_WELCOME_TITLE"), "\"");
|
|
|
+ this->SetOptionIfNotSet("CPACK_NSIS_INSTALLER_WELCOME_TITLE_CODE",
|
|
|
+ welcomeTitleCode.c_str());
|
|
|
+ }
|
|
|
+
|
|
|
+ if (this->IsSet("CPACK_NSIS_WELCOME_TITLE_3LINES")) {
|
|
|
+ this->SetOptionIfNotSet("CPACK_NSIS_INSTALLER_WELCOME_TITLE_3LINES_CODE",
|
|
|
+ "!define MUI_WELCOMEPAGE_TITLE_3LINES");
|
|
|
+ }
|
|
|
+
|
|
|
+ if (this->IsSet("CPACK_NSIS_FINISH_TITLE")) {
|
|
|
+ std::string finishTitleCode =
|
|
|
+ cmStrCat("!define MUI_FINISHPAGE_TITLE \"",
|
|
|
+ this->GetOption("CPACK_NSIS_FINISH_TITLE"), "\"");
|
|
|
+ this->SetOptionIfNotSet("CPACK_NSIS_INSTALLER_FINISH_TITLE_CODE",
|
|
|
+ finishTitleCode.c_str());
|
|
|
+ }
|
|
|
+
|
|
|
+ if (this->IsSet("CPACK_NSIS_FINISH_TITLE_3LINES")) {
|
|
|
+ this->SetOptionIfNotSet("CPACK_NSIS_INSTALLER_FINISH_TITLE_3LINES_CODE",
|
|
|
+ "!define MUI_FINISHPAGE_TITLE_3LINES");
|
|
|
+ }
|
|
|
+
|
|
|
// Setup all of the component sections
|
|
|
if (this->Components.empty()) {
|
|
|
this->SetOptionIfNotSet("CPACK_NSIS_INSTALLATION_TYPES", "");
|