Browse Source

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.
Konstantin Podsvirov 10 years ago
parent
commit
ad5c76af64
1 changed files with 4 additions and 2 deletions
  1. 4 2
      Source/CPack/IFW/cmCPackIFWGenerator.cxx

+ 4 - 2
Source/CPack/IFW/cmCPackIFWGenerator.cxx

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