diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2021-09-21 17:12:35 +0200 |
|---|---|---|
| committer | Marc Chevrier <marc.chevrier@gmail.com> | 2021-09-21 17:14:04 +0200 |
| commit | cc56dc7468bfee49dedbf395d6fca5c372d200fe (patch) | |
| tree | c4463a4dcdada55ca57cba3713fea88d8d2f3f57 /Source/cmFindCommon.cxx | |
| parent | 62834c07603e82aafabc082bbbcf74179a4cda27 (diff) | |
| download | cmake-cc56dc7468bfee49dedbf395d6fca5c372d200fe.tar.gz | |
Rename cmProp in cmValue
Diffstat (limited to 'Source/cmFindCommon.cxx')
| -rw-r--r-- | Source/cmFindCommon.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx index d2f96197b8..bdc9207727 100644 --- a/Source/cmFindCommon.cxx +++ b/Source/cmFindCommon.cxx @@ -11,9 +11,9 @@ #include "cmExecutionStatus.h" #include "cmMakefile.h" #include "cmMessageType.h" -#include "cmProperty.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" +#include "cmValue.h" #include "cmake.h" cmFindCommon::PathGroup cmFindCommon::PathGroup::All("ALL"); @@ -183,7 +183,7 @@ void cmFindCommon::SelectDefaultSearchModes() }; for (auto const& path : search_paths) { - cmProp def = this->Makefile->GetDefinition(path.second); + cmValue def = this->Makefile->GetDefinition(path.second); if (def) { path.first = !cmIsOn(*def); } @@ -203,11 +203,11 @@ void cmFindCommon::RerootPaths(std::vector<std::string>& paths) return; } - cmProp sysroot = this->Makefile->GetDefinition("CMAKE_SYSROOT"); - cmProp sysrootCompile = + cmValue sysroot = this->Makefile->GetDefinition("CMAKE_SYSROOT"); + cmValue sysrootCompile = this->Makefile->GetDefinition("CMAKE_SYSROOT_COMPILE"); - cmProp sysrootLink = this->Makefile->GetDefinition("CMAKE_SYSROOT_LINK"); - cmProp rootPath = this->Makefile->GetDefinition("CMAKE_FIND_ROOT_PATH"); + cmValue sysrootLink = this->Makefile->GetDefinition("CMAKE_SYSROOT_LINK"); + cmValue rootPath = this->Makefile->GetDefinition("CMAKE_FIND_ROOT_PATH"); const bool noSysroot = !cmNonempty(sysroot); const bool noCompileSysroot = !cmNonempty(sysrootCompile); const bool noLinkSysroot = !cmNonempty(sysrootLink); @@ -234,7 +234,7 @@ void cmFindCommon::RerootPaths(std::vector<std::string>& paths) cmSystemTools::ConvertToUnixSlashes(r); } - cmProp stagePrefix = this->Makefile->GetDefinition("CMAKE_STAGING_PREFIX"); + cmValue stagePrefix = this->Makefile->GetDefinition("CMAKE_STAGING_PREFIX"); // Copy the original set of unrooted paths. std::vector<std::string> unrootedPaths = paths; |