mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-29 02:19:18 -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/cmGetPropertyCommand.cxx
+4 -3
View File
@@ -20,6 +20,7 @@
#include "cmSystemTools.h"
#include "cmTarget.h"
#include "cmTest.h"
#include "cmValue.h"
#include "cmake.h"
class cmMessenger;
@@ -272,7 +273,7 @@ template <>
bool StoreResult(OutType infoType, cmMakefile& makefile,
const std::string& variable, std::nullptr_t value)
{
return StoreResult(infoType, makefile, variable, cmProp(value));
return StoreResult(infoType, makefile, variable, cmValue(value));
}
bool HandleGlobalMode(cmExecutionStatus& status, const std::string& name,
@@ -366,7 +367,7 @@ bool HandleTargetMode(cmExecutionStatus& status, const std::string& name,
}
cmListFileBacktrace bt = status.GetMakefile().GetBacktrace();
cmMessenger* messenger = status.GetMakefile().GetMessenger();
cmProp prop = target->GetComputedProperty(propertyName, messenger, bt);
cmValue prop = target->GetComputedProperty(propertyName, messenger, bt);
if (!prop) {
prop = target->GetProperty(propertyName);
}
@@ -445,7 +446,7 @@ bool HandleCacheMode(cmExecutionStatus& status, const std::string& name,
return false;
}
cmProp value = nullptr;
cmValue value = nullptr;
if (status.GetMakefile().GetState()->GetCacheEntryValue(name)) {
value = status.GetMakefile().GetState()->GetCacheEntryProperty(
name, propertyName);