diff options
author | Konstantin Podsvirov <konstantin@podsvirov.pro> | 2016-11-11 20:51:28 (GMT) |
---|---|---|
committer | Konstantin Podsvirov <konstantin@podsvirov.pro> | 2016-11-24 14:05:51 (GMT) |
commit | 88ecfd8ba122133777bb71b027df3684689d4e3a (patch) | |
tree | cc9b4c4fd394a424bc981e06cd8bc9d383ee85ed /Source/CPack/IFW/cmCPackIFWInstaller.cxx | |
parent | 8288d16126193e86bb6880a7d7b749649ad83e2c (diff) | |
download | CMake-88ecfd8ba122133777bb71b027df3684689d4e3a.zip CMake-88ecfd8ba122133777bb71b027df3684689d4e3a.tar.gz CMake-88ecfd8ba122133777bb71b027df3684689d4e3a.tar.bz2 |
CPackIFW: Add some options
New options is: DEFAULT, VIRTUAL, FORCED_INSTALLATION,
DISPLAY_NAME, DESCRIPTION and RELEASE_DATE.
Options added for both cpack_ifw_configure_component and
cpack_ifw_configure_component_group command.
Diffstat (limited to 'Source/CPack/IFW/cmCPackIFWInstaller.cxx')
-rw-r--r-- | Source/CPack/IFW/cmCPackIFWInstaller.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.cxx b/Source/CPack/IFW/cmCPackIFWInstaller.cxx index 0098a4b..3b68cfc 100644 --- a/Source/CPack/IFW/cmCPackIFWInstaller.cxx +++ b/Source/CPack/IFW/cmCPackIFWInstaller.cxx @@ -403,7 +403,11 @@ void cmCPackIFWInstaller::GeneratePackageFiles() // Check package group if (const char* option = GetOption("CPACK_IFW_PACKAGE_GROUP")) { package.ConfigureFromGroup(option); - package.ForcedInstallation = "true"; + std::string forcedOption = "CPACK_IFW_COMPONENT_GROUP_" + + cmsys::SystemTools::UpperCase(option) + "_FORCED_INSTALLATION"; + if (!GetOption(forcedOption)) { + package.ForcedInstallation = "true"; + } } else { package.ConfigureFromOptions(); } |