CPackIFW: Load module to set CPACK_IFW_FRAMEWORK_VERSION

This setting was added to support QtIFW 2.0 in commit v3.3.0-rc1~70^2~1
(CPackIFW: Add QtIFW 2.0 support, 2015-04-27).  We need to load the
CPackIFW module to initialize it if it is not set.
This commit is contained in:
Konstantin Podsvirov 2015-07-08 20:23:34 +03:00 committed by Brad King
parent a6916a6c6e
commit ad5c76af64

View File

@ -254,9 +254,11 @@ int cmCPackIFWGenerator::InitializeInternal()
const std::string BinCreatorOpt = "CPACK_IFW_BINARYCREATOR_EXECUTABLE"; const std::string BinCreatorOpt = "CPACK_IFW_BINARYCREATOR_EXECUTABLE";
const std::string RepoGenOpt = "CPACK_IFW_REPOGEN_EXECUTABLE"; const std::string RepoGenOpt = "CPACK_IFW_REPOGEN_EXECUTABLE";
const std::string FrameworkVersionOpt = "CPACK_IFW_FRAMEWORK_VERSION";
if(!this->IsSet(BinCreatorOpt) || if(!this->IsSet(BinCreatorOpt) ||
!this->IsSet(RepoGenOpt)) !this->IsSet(RepoGenOpt) ||
!this->IsSet(FrameworkVersionOpt))
{ {
this->ReadListFile("CPackIFW.cmake"); this->ReadListFile("CPackIFW.cmake");
} }
@ -296,7 +298,7 @@ int cmCPackIFWGenerator::InitializeInternal()
// Framework version // Framework version
if(const char* FrameworkVersionSrt = if(const char* FrameworkVersionSrt =
this->GetOption("CPACK_IFW_FRAMEWORK_VERSION")) this->GetOption(FrameworkVersionOpt))
{ {
FrameworkVersion = FrameworkVersionSrt; FrameworkVersion = FrameworkVersionSrt;
} }