mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-16 20:21:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

InnoSetup: Always specify at least one component installation type

Browse Source 
Inno Setup implicitly creates three installation types if none is
specified in the script. This causes some component features (e.g.
`REQUIRED`) to lose their functionality.  Teach the generator to always
specify a "custom" installation type when using components.

Fixes: #25083
This commit is contained in:
Jannik Alber
2023-07-14 21:10:42 +02:00
committed by Brad King
parent 8bcba75b1c
commit c80190c6ab
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Source/CPack/cmCPackInnoSetupGenerator.cxx
View File

@@ -583,10 +583,8 @@ bool cmCPackInnoSetupGenerator::ProcessComponents()
"this script uses components }");
// Installation types
bool noTypes = true;
std::vector<cmCPackInstallationType*> types(InstallationTypes.size());
for (auto& i : InstallationTypes) {
noTypes = false;
types[i.second.Index - 1] = &i.second;
}
@@ -601,17 +599,16 @@ bool cmCPackInnoSetupGenerator::ProcessComponents()
typeInstructions.push_back(ISKeyValueLine(params));
}
if (!noTypes) {
// Inno Setup requires the "custom" type
cmCPackInnoSetupKeyValuePairs params;
// Inno Setup requires the additional "custom" type
cmCPackInnoSetupKeyValuePairs customTypeParams;
params["Name"] = "\"custom\"";
params["Description"] = "\"{code:CPackGetCustomInstallationMessage}\"";
params["Flags"] = "iscustom";
customTypeParams["Name"] = "\"custom\"";
customTypeParams["Description"] =
"\"{code:CPackGetCustomInstallationMessage}\"";
customTypeParams["Flags"] = "iscustom";
allTypes.push_back("custom");
typeInstructions.push_back(ISKeyValueLine(params));
}
allTypes.push_back("custom");
typeInstructions.push_back(ISKeyValueLine(customTypeParams));
// Components
std::vector<cmCPackComponent*> downloadedComponents;