diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-03-16 17:45:00 (GMT) |
|---|---|---|
| committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-03-16 17:47:05 (GMT) |
| commit | fad0ee54041bf05f0d22b78e111b03eb368a213c (patch) | |
| tree | c4dfc14f8929a9ec417da850f4b7d5c4e3c27265 /Source/cmTarget.cxx | |
| parent | 6f4b1ba96d724cbbc1642a7beb6ae9ec2b51d3bc (diff) | |
| download | CMake-fad0ee54041bf05f0d22b78e111b03eb368a213c.zip CMake-fad0ee54041bf05f0d22b78e111b03eb368a213c.tar.gz CMake-fad0ee54041bf05f0d22b78e111b03eb368a213c.tar.bz2 | |
cmTargetPropertyComputer::GetProperty: return cmProp
Diffstat (limited to 'Source/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 10515c2..7af0edd 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -78,7 +78,7 @@ const std::string& cmTargetPropertyComputer::ComputeLocation<cmTarget>( } template <> -const char* cmTargetPropertyComputer::GetSources<cmTarget>( +cmProp cmTargetPropertyComputer::GetSources<cmTarget>( cmTarget const* tgt, cmMessenger* messenger, cmListFileBacktrace const& context) { @@ -156,7 +156,7 @@ const char* cmTargetPropertyComputer::GetSources<cmTarget>( } static std::string srcs; srcs = ss.str(); - return srcs.c_str(); + return &srcs; } class cmTargetInternals @@ -1613,7 +1613,9 @@ const char* cmTarget::GetComputedProperty( const std::string& prop, cmMessenger* messenger, cmListFileBacktrace const& context) const { - return cmTargetPropertyComputer::GetProperty(this, prop, messenger, context); + cmProp retVal = + cmTargetPropertyComputer::GetProperty(this, prop, messenger, context); + return retVal ? retVal->c_str() : nullptr; } const char* cmTarget::GetProperty(const std::string& prop) const |