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/cmTargetPropertyComputer.h | |
parent | 62834c07603e82aafabc082bbbcf74179a4cda27 (diff) | |
download | CMake-cc56dc7468bfee49dedbf395d6fca5c372d200fe.zip CMake-cc56dc7468bfee49dedbf395d6fca5c372d200fe.tar.gz CMake-cc56dc7468bfee49dedbf395d6fca5c372d200fe.tar.bz2 |
Rename cmProp in cmValue
Diffstat (limited to 'Source/cmTargetPropertyComputer.h')
-rw-r--r-- | Source/cmTargetPropertyComputer.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Source/cmTargetPropertyComputer.h b/Source/cmTargetPropertyComputer.h index a749b53..e61a1fc 100644 --- a/Source/cmTargetPropertyComputer.h +++ b/Source/cmTargetPropertyComputer.h @@ -7,10 +7,10 @@ #include <string> #include "cmListFileCache.h" -#include "cmProperty.h" #include "cmStateTypes.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" +#include "cmValue.h" class cmMessenger; @@ -18,11 +18,11 @@ class cmTargetPropertyComputer { public: template <typename Target> - static cmProp GetProperty(Target const* tgt, const std::string& prop, - cmMessenger* messenger, - cmListFileBacktrace const& context) + static cmValue GetProperty(Target const* tgt, const std::string& prop, + cmMessenger* messenger, + cmListFileBacktrace const& context) { - if (cmProp loc = GetLocation(tgt, prop, messenger, context)) { + if (cmValue loc = GetLocation(tgt, prop, messenger, context)) { return loc; } if (cmSystemTools::GetFatalErrorOccured()) { @@ -46,9 +46,9 @@ private: std::string const& config); template <typename Target> - static cmProp GetLocation(Target const* tgt, std::string const& prop, - cmMessenger* messenger, - cmListFileBacktrace const& context) + static cmValue GetLocation(Target const* tgt, std::string const& prop, + cmMessenger* messenger, + cmListFileBacktrace const& context) { // Watch for special "computed" properties that are dependent on @@ -65,7 +65,7 @@ private: context)) { return nullptr; } - return cmProp(ComputeLocationForBuild(tgt)); + return cmValue(ComputeLocationForBuild(tgt)); } // Support "LOCATION_<CONFIG>". @@ -76,7 +76,7 @@ private: return nullptr; } std::string configName = prop.substr(9); - return cmProp(ComputeLocation(tgt, configName)); + return cmValue(ComputeLocation(tgt, configName)); } // Support "<CONFIG>_LOCATION". @@ -89,7 +89,7 @@ private: context)) { return nullptr; } - return cmProp(ComputeLocation(tgt, configName)); + return cmValue(ComputeLocation(tgt, configName)); } } } @@ -97,6 +97,6 @@ private: } template <typename Target> - static cmProp GetSources(Target const* tgt, cmMessenger* messenger, - cmListFileBacktrace const& context); + static cmValue GetSources(Target const* tgt, cmMessenger* messenger, + cmListFileBacktrace const& context); }; |