summaryrefslogtreecommitdiffstats
path: root/Source/cmGetSourceFilePropertyCommand.cxx
diff options
context:
space:
mode:
authorVitaly Stakhovsky <vvs31415@gitlab.org>2020-11-04 15:00:00 (GMT)
committerVitaly Stakhovsky <vvs31415@gitlab.org>2020-11-04 15:11:54 (GMT)
commitc7b50349de5e56d7584fa644832170d1e08ef62e (patch)
tree0fd42e52ae4cc439867b46b85664f0e1215690e4 /Source/cmGetSourceFilePropertyCommand.cxx
parent622ac065d2abeb53de3548b7e4f3d9b5980dfa8d (diff)
downloadCMake-c7b50349de5e56d7584fa644832170d1e08ef62e.zip
CMake-c7b50349de5e56d7584fa644832170d1e08ef62e.tar.gz
CMake-c7b50349de5e56d7584fa644832170d1e08ef62e.tar.bz2
cmSourceFile::GetPropertyForUser: return cmProp
also fix GetSafeProperty() return type
Diffstat (limited to 'Source/cmGetSourceFilePropertyCommand.cxx')
-rw-r--r--Source/cmGetSourceFilePropertyCommand.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGetSourceFilePropertyCommand.cxx b/Source/cmGetSourceFilePropertyCommand.cxx
index 5395bc8..212a968 100644
--- a/Source/cmGetSourceFilePropertyCommand.cxx
+++ b/Source/cmGetSourceFilePropertyCommand.cxx
@@ -4,6 +4,7 @@
#include "cmExecutionStatus.h"
#include "cmMakefile.h"
+#include "cmProperty.h"
#include "cmSetPropertyCommand.h"
#include "cmSourceFile.h"
@@ -57,14 +58,14 @@ bool cmGetSourceFilePropertyCommand(std::vector<std::string> const& args,
}
if (sf) {
- const char* prop = nullptr;
+ cmProp prop = nullptr;
if (!args[property_arg_index].empty()) {
prop = sf->GetPropertyForUser(args[property_arg_index]);
}
if (prop) {
// Set the value on the original Makefile scope, not the scope of the
// requested directory.
- status.GetMakefile().AddDefinition(var, prop);
+ status.GetMakefile().AddDefinition(var, *prop);
return true;
}
}