cmTarget: make Visibility an enum class

This commit is contained in:
Ben Boeckel
2023-02-14 12:21:06 -05:00
parent 5b58695321
commit 1d0426f642
4 changed files with 18 additions and 18 deletions

View File

@@ -85,7 +85,7 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
std::unique_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(*prop);
cmTarget dummyHead("try_compile_dummy_exe", cmStateEnums::EXECUTABLE,
cmTarget::VisibilityNormal, tgt->Target->GetMakefile(),
cmTarget::Visibility::Normal, tgt->Target->GetMakefile(),
cmTarget::PerConfig::Yes);
cmGeneratorTarget gDummyHead(&dummyHead, tgt->GetLocalGenerator());

View File

@@ -2120,7 +2120,7 @@ std::pair<cmTarget&, bool> cmMakefile::CreateNewTarget(
cmTarget::PerConfig perConfig)
{
auto ib = this->Targets.emplace(
name, cmTarget(name, type, cmTarget::VisibilityNormal, this, perConfig));
name, cmTarget(name, type, cmTarget::Visibility::Normal, this, perConfig));
auto it = ib.first;
if (!ib.second) {
return std::make_pair(std::ref(it->second), false);
@@ -4203,8 +4203,8 @@ cmTarget* cmMakefile::AddImportedTarget(const std::string& name,
// Create the target.
std::unique_ptr<cmTarget> target(
new cmTarget(name, type,
global ? cmTarget::VisibilityImportedGlobally
: cmTarget::VisibilityImported,
global ? cmTarget::Visibility::ImportedGlobally
: cmTarget::Visibility::Imported,
this, cmTarget::PerConfig::Yes));
// Add to the set of available imported targets.

View File

@@ -1863,7 +1863,7 @@ void cmTarget::StoreProperty(const std::string& prop, ValueType value)
}
/* no need to change anything if value does not change */
if (!this->IsImportedGloballyVisible()) {
this->impl->TargetVisibility = VisibilityImportedGlobally;
this->impl->TargetVisibility = Visibility::ImportedGlobally;
this->GetGlobalGenerator()->IndexTarget(this);
}
} else if (cmHasLiteralPrefix(prop, "IMPORTED_LIBNAME") &&
@@ -2557,10 +2557,10 @@ bool cmTarget::IsAIX() const
bool cmTarget::IsNormal() const
{
switch (this->impl->TargetVisibility) {
case VisibilityNormal:
case Visibility::Normal:
return true;
case VisibilityImported:
case VisibilityImportedGlobally:
case Visibility::Imported:
case Visibility::ImportedGlobally:
return false;
}
assert(false && "unknown visibility (IsNormal)");
@@ -2570,10 +2570,10 @@ bool cmTarget::IsNormal() const
bool cmTargetInternals::IsImported() const
{
switch (this->TargetVisibility) {
case cmTarget::VisibilityImported:
case cmTarget::VisibilityImportedGlobally:
case cmTarget::Visibility::Imported:
case cmTarget::Visibility::ImportedGlobally:
return true;
case cmTarget::VisibilityNormal:
case cmTarget::Visibility::Normal:
return false;
}
assert(false && "unknown visibility (IsImported)");
@@ -2588,10 +2588,10 @@ bool cmTarget::IsImported() const
bool cmTarget::IsImportedGloballyVisible() const
{
switch (this->impl->TargetVisibility) {
case VisibilityImportedGlobally:
case Visibility::ImportedGlobally:
return true;
case VisibilityNormal:
case VisibilityImported:
case Visibility::Normal:
case Visibility::Imported:
return false;
}
assert(false && "unknown visibility (IsImportedGloballyVisible)");

View File

@@ -46,11 +46,11 @@ class BTs;
class cmTarget
{
public:
enum Visibility
enum class Visibility
{
VisibilityNormal,
VisibilityImported,
VisibilityImportedGlobally
Normal,
Imported,
ImportedGlobally,
};
enum class PerConfig