kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'cpack-ifw-framework-version' into release

This commit is contained in:
Brad King 2015-07-08 16:08:58 -04:00
parent d805767545 ad5c76af64
commit 6c16bd5388
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/CPack/IFW/cmCPackIFWGenerator.cxx
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;
} }