diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2021-09-21 15:12:35 (GMT) |
|---|---|---|
| committer | Marc Chevrier <marc.chevrier@gmail.com> | 2021-09-21 15:14:04 (GMT) |
| commit | cc56dc7468bfee49dedbf395d6fca5c372d200fe (patch) | |
| tree | c4463a4dcdada55ca57cba3713fea88d8d2f3f57 /Source/cmTryRunCommand.cxx | |
| parent | 62834c07603e82aafabc082bbbcf74179a4cda27 (diff) | |
| download | CMake-cc56dc7468bfee49dedbf395d6fca5c372d200fe.zip CMake-cc56dc7468bfee49dedbf395d6fca5c372d200fe.tar.gz CMake-cc56dc7468bfee49dedbf395d6fca5c372d200fe.tar.bz2 | |
Rename cmProp in cmValue
Diffstat (limited to 'Source/cmTryRunCommand.cxx')
| -rw-r--r-- | Source/cmTryRunCommand.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx index 8cac74d..cc9e158 100644 --- a/Source/cmTryRunCommand.cxx +++ b/Source/cmTryRunCommand.cxx @@ -9,12 +9,12 @@ #include "cmDuration.h" #include "cmMakefile.h" #include "cmMessageType.h" -#include "cmProperty.h" #include "cmRange.h" #include "cmState.h" #include "cmStateTypes.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" +#include "cmValue.h" #include "cmake.h" class cmExecutionStatus; @@ -162,7 +162,7 @@ bool cmTryRunCommand::InitialPass(std::vector<std::string> const& argv, if (!this->OutputVariable.empty()) { // if the TryCompileCore saved output in this outputVariable then // prepend that output to this output - cmProp compileOutput = + cmValue compileOutput = this->Makefile->GetDefinition(this->OutputVariable); if (compileOutput) { runOutputContents = *compileOutput + runOutputContents; @@ -260,7 +260,7 @@ void cmTryRunCommand::DoNotRunExecutable(const std::string& runArgs, comment.c_str(), cmStateEnums::STRING); cmState* state = this->Makefile->GetState(); - cmProp existingValue = state->GetCacheEntryValue(this->RunResultVariable); + cmValue existingValue = state->GetCacheEntryValue(this->RunResultVariable); if (existingValue) { state->SetCacheEntryProperty(this->RunResultVariable, "ADVANCED", "1"); } @@ -282,7 +282,7 @@ void cmTryRunCommand::DoNotRunExecutable(const std::string& runArgs, internalRunOutputName, "PLEASE_FILL_OUT-NOTFOUND", comment.c_str(), cmStateEnums::STRING); cmState* state = this->Makefile->GetState(); - cmProp existing = state->GetCacheEntryValue(internalRunOutputName); + cmValue existing = state->GetCacheEntryValue(internalRunOutputName); if (existing) { state->SetCacheEntryProperty(internalRunOutputName, "ADVANCED", "1"); } |