diff options
| author | Konstantin Podsvirov <konstantin@podsvirov.pro> | 2015-07-08 20:23:34 +0300 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-07-08 16:02:03 -0400 |
| commit | ad5c76af6460dad1fcdcd401ac9d2275663af445 (patch) | |
| tree | c42fed97f8b3436ba53c82ce50e69ea4f6a46b01 | |
| parent | a6916a6c6e397bda8b381f65dbfc59d3c52f8525 (diff) | |
| download | cmake-ad5c76af6460dad1fcdcd401ac9d2275663af445.tar.gz | |
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.
| -rw-r--r-- | Source/CPack/IFW/cmCPackIFWGenerator.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.cxx b/Source/CPack/IFW/cmCPackIFWGenerator.cxx index 80ba068e1a..09e123cd47 100644 --- a/Source/CPack/IFW/cmCPackIFWGenerator.cxx +++ b/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; } |