mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 16:32:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmCPackGenerator::SetOption accepts cmProp or std::string

Browse Source
This commit is contained in:
Marc Chevrier
2021-09-14 18:41:44 +02:00
parent 1375862764
commit 7aeb262278
2 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Source/CPack/cmCPackGenerator.cxx
View File

@@ -994,17 +994,29 @@ bool cmCPackGenerator::ReadListFile(const char* moduleName)
return retval;
}
void cmCPackGenerator::SetOptionIfNotSet(const std::string& op,
const char* value)
template <typename ValueType>
void cmCPackGenerator::StoreOptionIfNotSet(const std::string& op,
ValueType value)
{
cmProp def = this->MakefileMap->GetDefinition(op);
if (cmNonempty(def)) {
return;
}
this->SetOption(op, value);
this->StoreOption(op, value);
}
void cmCPackGenerator::SetOption(const std::string& op, const char* value)
void cmCPackGenerator::SetOptionIfNotSet(const std::string& op,
const char* value)
{
this->StoreOptionIfNotSet(op, value);
}
void cmCPackGenerator::SetOptionIfNotSet(const std::string& op, cmProp value)
{
this->StoreOptionIfNotSet(op, value);
}
template <typename ValueType>
void cmCPackGenerator::StoreOption(const std::string& op, ValueType value)
{
if (!value) {
this->MakefileMap->RemoveDefinition(op);
@@ -1016,6 +1028,15 @@ void cmCPackGenerator::SetOption(const std::string& op, const char* value)
this->MakefileMap->AddDefinition(op, value);
}
void cmCPackGenerator::SetOption(const std::string& op, const char* value)
{
this->StoreOption(op, value);
}
void cmCPackGenerator::SetOption(const std::string& op, cmProp value)
{
this->StoreOption(op, value);
}
int cmCPackGenerator::DoPackage()
{
cmCPackLogger(cmCPackLog::LOG_OUTPUT,

16
Source/CPack/cmCPackGenerator.h
View File

@@ -85,7 +85,17 @@ public:
//! Set and get the options
void SetOption(const std::string& op, const char* value);
void SetOption(const std::string& op, const std::string& value)
{
this->SetOption(op, cmProp(value));
}
void SetOption(const std::string& op, cmProp value);
void SetOptionIfNotSet(const std::string& op, const char* value);
void SetOptionIfNotSet(const std::string& op, const std::string& value)
{
this->SetOptionIfNotSet(op, cmProp(value));
}
void SetOptionIfNotSet(const std::string& op, cmProp value);
cmProp GetOption(const std::string& op) const;
std::vector<std::string> GetOptions() const;
bool IsSet(const std::string& name) const;
@@ -324,6 +334,12 @@ protected:
bool TraceExpand;
cmMakefile* MakefileMap;
private:
template <typename ValueType>
void StoreOption(const std::string& op, ValueType value);
template <typename ValueType>
void StoreOptionIfNotSet(const std::string& op, ValueType value);
};
#define cmCPackTypeMacro(klass, superclass) \