diff options
| author | Brad King <brad.king@kitware.com> | 2015-07-08 20:08:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-07-08 20:08:58 (GMT) |
| commit | 6c16bd53882052f96182ef5aec4ecb2485321991 (patch) | |
| tree | 44e45f9c44489e2138b0cc38f5ba508a1f5019a5 /Source | |
| parent | d805767545bd4829db4fa1bd2724042f895a2cd9 (diff) | |
| parent | ad5c76af6460dad1fcdcd401ac9d2275663af445 (diff) | |
| download | CMake-6c16bd53882052f96182ef5aec4ecb2485321991.zip CMake-6c16bd53882052f96182ef5aec4ecb2485321991.tar.gz CMake-6c16bd53882052f96182ef5aec4ecb2485321991.tar.bz2 | |
Merge branch 'cpack-ifw-framework-version' into release
Diffstat (limited to 'Source')
| -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 80ba068..09e123c 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; } |