diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-30 13:37:30 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-11-30 13:37:30 (GMT) |
| commit | 2036639b55fe5a1baaa36145368e7229834d6387 (patch) | |
| tree | bb1f4f0b0a4100177ceecd52d174ea53cfd9b2f5 /Source/CPack/IFW/cmCPackIFWInstaller.cxx | |
| parent | 8cdf566bc00da2b1a839a74bdbc99cfbc305bfee (diff) | |
| parent | 88ecfd8ba122133777bb71b027df3684689d4e3a (diff) | |
| download | CMake-2036639b55fe5a1baaa36145368e7229834d6387.zip CMake-2036639b55fe5a1baaa36145368e7229834d6387.tar.gz CMake-2036639b55fe5a1baaa36145368e7229834d6387.tar.bz2 | |
Merge topic 'cpack-ifw-options'
88ecfd8b CPackIFW: Add some options
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 ba3248f..a6d443b 100644 --- a/Source/CPack/IFW/cmCPackIFWInstaller.cxx +++ b/Source/CPack/IFW/cmCPackIFWInstaller.cxx @@ -405,7 +405,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(); } |