diff options
| author | Brad King <brad.king@kitware.com> | 2015-07-09 13:17:23 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-07-09 13:17:23 (GMT) |
| commit | ab4b66283215a19b9e7339c64af4d86f40165ba6 (patch) | |
| tree | b6859e7583b2ade640bd58398d834181b10eba0d /Source | |
| parent | 5827d9a626918c91eef4ff84bd115c0d35013a7d (diff) | |
| parent | ad5c76af6460dad1fcdcd401ac9d2275663af445 (diff) | |
| download | CMake-ab4b66283215a19b9e7339c64af4d86f40165ba6.zip CMake-ab4b66283215a19b9e7339c64af4d86f40165ba6.tar.gz CMake-ab4b66283215a19b9e7339c64af4d86f40165ba6.tar.bz2 | |
Merge topic 'cpack-ifw-framework-version'
ad5c76af CPackIFW: Load module to set CPACK_IFW_FRAMEWORK_VERSION
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; } |