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

Merge topic 'make-cpack-options-boolean' 

5bc6444 CPack: use IsOn instead of IsSet for boolean CPack options
This commit is contained in:
Brad King 2013-11-25 08:37:20 -05:00 committed by CMake Topic Stage
parent ac2acd22dd 5bc64440e1
commit e620ede898
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/CPack/cmCPackGenerator.cxx
View File

@ -580,7 +580,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
* (this works at CPack time too) * (this works at CPack time too)
*/ */
if (this->SupportsComponentInstallation() & if (this->SupportsComponentInstallation() &
!(this->IsSet("CPACK_MONOLITHIC_INSTALL"))) !(this->IsOn("CPACK_MONOLITHIC_INSTALL")))
{ {
// Determine the installation types for this project (if provided). // Determine the installation types for this project (if provided).
std::string installTypesVar = "CPACK_" std::string installTypesVar = "CPACK_"
@ -1532,13 +1532,13 @@ cmCPackGenerator::GetComponent(const char *projectName, const char *name)
component->DisplayName = component->Name; component->DisplayName = component->Name;
} }
component->IsHidden component->IsHidden
= this->IsSet((macroPrefix + "_HIDDEN").c_str()); = this->IsOn((macroPrefix + "_HIDDEN").c_str());
component->IsRequired component->IsRequired
= this->IsSet((macroPrefix + "_REQUIRED").c_str()); = this->IsOn((macroPrefix + "_REQUIRED").c_str());
component->IsDisabledByDefault component->IsDisabledByDefault
= this->IsSet((macroPrefix + "_DISABLED").c_str()); = this->IsOn((macroPrefix + "_DISABLED").c_str());
component->IsDownloaded component->IsDownloaded
= this->IsSet((macroPrefix + "_DOWNLOADED").c_str()) = this->IsOn((macroPrefix + "_DOWNLOADED").c_str())
|| cmSystemTools::IsOn(this->GetOption("CPACK_DOWNLOAD_ALL")); || cmSystemTools::IsOn(this->GetOption("CPACK_DOWNLOAD_ALL"));
const char* archiveFile = this->GetOption((macroPrefix + const char* archiveFile = this->GetOption((macroPrefix +
@ -1635,9 +1635,9 @@ cmCPackGenerator::GetComponentGroup(const char *projectName, const char *name)
group->Description = description; group->Description = description;
} }
group->IsBold group->IsBold
= this->IsSet((macroPrefix + "_BOLD_TITLE").c_str()); = this->IsOn((macroPrefix + "_BOLD_TITLE").c_str());
group->IsExpandedByDefault group->IsExpandedByDefault
= this->IsSet((macroPrefix + "_EXPANDED").c_str()); = this->IsOn((macroPrefix + "_EXPANDED").c_str());
const char* parentGroupName const char* parentGroupName
= this->GetOption((macroPrefix + "_PARENT_GROUP").c_str()); = this->GetOption((macroPrefix + "_PARENT_GROUP").c_str());
if (parentGroupName && *parentGroupName) if (parentGroupName && *parentGroupName)