diff options
Diffstat (limited to 'Source/cmStringCommand.cxx')
| -rw-r--r-- | Source/cmStringCommand.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx index 5fa309d..f44fcf7 100644 --- a/Source/cmStringCommand.cxx +++ b/Source/cmStringCommand.cxx @@ -31,7 +31,6 @@ #include "cmGeneratorExpression.h" #include "cmMakefile.h" #include "cmMessageType.h" -#include "cmProperty.h" #include "cmRange.h" #include "cmStringAlgorithms.h" #include "cmStringReplaceHelper.h" @@ -39,6 +38,7 @@ #include "cmSystemTools.h" #include "cmTimestamp.h" #include "cmUuid.h" +#include "cmValue.h" namespace { @@ -572,7 +572,7 @@ bool HandlePrependCommand(std::vector<std::string> const& args, const std::string& variable = args[1]; std::string value = cmJoin(cmMakeRange(args).advance(2), std::string()); - cmProp oldValue = status.GetMakefile().GetDefinition(variable); + cmValue oldValue = status.GetMakefile().GetDefinition(variable); if (oldValue) { value += *oldValue; } @@ -1054,7 +1054,7 @@ Json::Value& ResolvePath(Json::Value& json, Args path) } } return *search; -}; +} Json::Value ReadJson(const std::string& jsonstr) { |