mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-02 12:19:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename cmProp in cmValue

Browse Source
This commit is contained in:
Marc Chevrier
2021-09-21 17:12:35 +02:00
parent 62834c0760
commit cc56dc7468
188 changed files with 1762 additions and 1734 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmState.cxx
+18 -18
View File
@@ -144,20 +144,20 @@ std::vector<std::string> cmState::GetCacheEntryKeys() const
return this->CacheManager->GetCacheEntryKeys();
}
cmProp cmState::GetCacheEntryValue(std::string const& key) const
cmValue cmState::GetCacheEntryValue(std::string const& key) const
{
return this->CacheManager->GetCacheEntryValue(key);
}
std::string cmState::GetSafeCacheEntryValue(std::string const& key) const
{
if (cmProp val = this->GetCacheEntryValue(key)) {
if (cmValue val = this->GetCacheEntryValue(key)) {
return *val;
}
return std::string();
}
cmProp cmState::GetInitializedCacheValue(std::string const& key) const
cmValue cmState::GetInitializedCacheValue(std::string const& key) const
{
return this->CacheManager->GetInitializedCacheValue(key);
}
@@ -194,8 +194,8 @@ std::vector<std::string> cmState::GetCacheEntryPropertyList(
return this->CacheManager->GetCacheEntryPropertyList(key);
}
cmProp cmState::GetCacheEntryProperty(std::string const& key,
std::string const& propertyName)
cmValue cmState::GetCacheEntryProperty(std::string const& key,
std::string const& propertyName)
{
return this->CacheManager->GetCacheEntryProperty(key, propertyName);
}
@@ -206,7 +206,7 @@ bool cmState::GetCacheEntryPropertyAsBool(std::string const& key,
return this->CacheManager->GetCacheEntryPropertyAsBool(key, propertyName);
}
void cmState::AddCacheEntry(const std::string& key, cmProp value,
void cmState::AddCacheEntry(const std::string& key, cmValue value,
const char* helpString,
cmStateEnums::CacheEntryType type)
{
@@ -472,7 +472,7 @@ void cmState::AddUnexpectedCommand(std::string const& name, const char* error)
name,
[name, error](std::vector<cmListFileArgument> const&,
cmExecutionStatus& status) -> bool {
cmProp versionValue =
cmValue versionValue =
status.GetMakefile().GetDefinition("CMAKE_MINIMUM_REQUIRED_VERSION");
if (name == "endif" &&
(!versionValue || atof(versionValue->c_str()) <= 1.4)) {
@@ -564,7 +564,7 @@ void cmState::SetGlobalProperty(const std::string& prop, const char* value)
{
this->GlobalProperties.SetProperty(prop, value);
}
void cmState::SetGlobalProperty(const std::string& prop, cmProp value)
void cmState::SetGlobalProperty(const std::string& prop, cmValue value)
{
this->GlobalProperties.SetProperty(prop, value);
}
@@ -575,7 +575,7 @@ void cmState::AppendGlobalProperty(const std::string& prop,
this->GlobalProperties.AppendProperty(prop, value, asString);
}
cmProp cmState::GetGlobalProperty(const std::string& prop)
cmValue cmState::GetGlobalProperty(const std::string& prop)
{
if (prop == "CACHE_VARIABLES") {
std::vector<std::string> cacheKeys = this->GetCacheEntryKeys();
@@ -602,47 +602,47 @@ cmProp cmState::GetGlobalProperty(const std::string& prop)
if (prop == "CMAKE_C_KNOWN_FEATURES") {
static const std::string s_out(
&FOR_EACH_C_FEATURE(STRING_LIST_ELEMENT)[1]);
return cmProp(s_out);
return cmValue(s_out);
}
if (prop == "CMAKE_C90_KNOWN_FEATURES") {
static const std::string s_out(
&FOR_EACH_C90_FEATURE(STRING_LIST_ELEMENT)[1]);
return cmProp(s_out);
return cmValue(s_out);
}
if (prop == "CMAKE_C99_KNOWN_FEATURES") {
static const std::string s_out(
&FOR_EACH_C99_FEATURE(STRING_LIST_ELEMENT)[1]);
return cmProp(s_out);
return cmValue(s_out);
}
if (prop == "CMAKE_C11_KNOWN_FEATURES") {
static const std::string s_out(
&FOR_EACH_C11_FEATURE(STRING_LIST_ELEMENT)[1]);
return cmProp(s_out);
return cmValue(s_out);
}
if (prop == "CMAKE_CXX_KNOWN_FEATURES") {
static const std::string s_out(
&FOR_EACH_CXX_FEATURE(STRING_LIST_ELEMENT)[1]);
return cmProp(s_out);
return cmValue(s_out);
}
if (prop == "CMAKE_CXX98_KNOWN_FEATURES") {
static const std::string s_out(
&FOR_EACH_CXX98_FEATURE(STRING_LIST_ELEMENT)[1]);
return cmProp(s_out);
return cmValue(s_out);
}
if (prop == "CMAKE_CXX11_KNOWN_FEATURES") {
static const std::string s_out(
&FOR_EACH_CXX11_FEATURE(STRING_LIST_ELEMENT)[1]);
return cmProp(s_out);
return cmValue(s_out);
}
if (prop == "CMAKE_CXX14_KNOWN_FEATURES") {
static const std::string s_out(
&FOR_EACH_CXX14_FEATURE(STRING_LIST_ELEMENT)[1]);
return cmProp(s_out);
return cmValue(s_out);
}
if (prop == "CMAKE_CUDA_KNOWN_FEATURES") {
static const std::string s_out(
&FOR_EACH_CUDA_FEATURE(STRING_LIST_ELEMENT)[1]);
return cmProp(s_out);
return cmValue(s_out);
}
#undef STRING_LIST_ELEMENT