kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'cpack-nsis-bitmap' 

3758af12 CPackNSIS: Add options to set the bitmap for NSIS installer left side
This commit is contained in:
Brad King 2015-10-08 10:31:48 -04:00 committed by CMake Topic Stage
parent 3cf71728a1 3758af12fa
commit c997595ea3
4 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Help/release/dev/cpack-nsis-bitmap.rst Normal file
View File

@ -0,0 +1,6 @@
cpack-nsis-bitmap
-----------------
* The :module:`CPackNSIS` module learned new variables to add bitmaps to the
installer. See the :variable:`CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP`
and :variable:`CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP` variables.

8
Modules/CPackNSIS.cmake
View File

@ -30,6 +30,14 @@
# #
# undocumented. # undocumented.
# #
# .. variable:: CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP
#
# The filename of a bitmap to use as the NSIS MUI_WELCOMEFINISHPAGE_BITMAP.
#
# .. variable:: CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP
#
# The filename of a bitmap to use as the NSIS MUI_UNWELCOMEFINISHPAGE_BITMAP.
#
# .. variable:: CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS # .. variable:: CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS
# #
# Extra NSIS commands that will be added to the beginning of the install # Extra NSIS commands that will be added to the beginning of the install

2
Modules/NSIS.template.in
View File

@ -542,6 +542,8 @@ FunctionEnd
; Define some macro setting for the gui ; Define some macro setting for the gui
@CPACK_NSIS_INSTALLER_MUI_ICON_CODE@ @CPACK_NSIS_INSTALLER_MUI_ICON_CODE@
@CPACK_NSIS_INSTALLER_ICON_CODE@ @CPACK_NSIS_INSTALLER_ICON_CODE@
@CPACK_NSIS_INSTALLER_MUI_WELCOMEFINISH_CODE@
@CPACK_NSIS_INSTALLER_MUI_UNWELCOMEFINISH_CODE@
@CPACK_NSIS_INSTALLER_MUI_COMPONENTS_DESC@ @CPACK_NSIS_INSTALLER_MUI_COMPONENTS_DESC@
@CPACK_NSIS_INSTALLER_MUI_FINISHPAGE_RUN_CODE@ @CPACK_NSIS_INSTALLER_MUI_FINISHPAGE_RUN_CODE@

22
Source/CPack/cmCPackNSISGenerator.cxx
View File

@ -157,6 +157,28 @@ int cmCPackNSISGenerator::PackageFiles()
installerIconCode.c_str()); installerIconCode.c_str());
} }
if (this->IsSet("CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP"))
{
std::string installerBitmapCode =
"!define MUI_WELCOMEFINISHPAGE_BITMAP \"";
installerBitmapCode +=
this->GetOption("CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP");
installerBitmapCode += "\"\n";
this->SetOptionIfNotSet("CPACK_NSIS_INSTALLER_MUI_WELCOMEFINISH_CODE",
installerBitmapCode.c_str());
}
if (this->IsSet("CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP"))
{
std::string installerBitmapCode =
"!define MUI_UNWELCOMEFINISHPAGE_BITMAP \"";
installerBitmapCode +=
this->GetOption("CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP");
installerBitmapCode += "\"\n";
this->SetOptionIfNotSet("CPACK_NSIS_INSTALLER_MUI_UNWELCOMEFINISH_CODE",
installerBitmapCode.c_str());
}
if(this->IsSet("CPACK_NSIS_MUI_FINISHPAGE_RUN")) if(this->IsSet("CPACK_NSIS_MUI_FINISHPAGE_RUN"))
{ {
std::string installerRunCode = "!define MUI_FINISHPAGE_RUN \"$INSTDIR\\"; std::string installerRunCode = "!define MUI_FINISHPAGE_RUN \"$INSTDIR\\";