diff options
author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-07-11 14:00:00 -0400 |
---|---|---|
committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-07-11 14:03:03 -0400 |
commit | 18726ad634d0f182940d45e9f569000cebcc4377 (patch) | |
tree | 89e7eea76cb7226f58c8a567a24b9ccc7533d0db /Source/cmLocalGenerator.cxx | |
parent | fd1df4995b6c1e063bb978e034a264b0e2d59f63 (diff) | |
download | cmake-18726ad634d0f182940d45e9f569000cebcc4377.tar.gz |
GetFeature(): return cmProp
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
-rw-r--r-- | Source/cmLocalGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 489065bec4..e7f2e640ab 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -3253,8 +3253,8 @@ void cmLocalGenerator::AppendFeatureOptions(std::string& flags, } } -const char* cmLocalGenerator::GetFeature(const std::string& feature, - const std::string& config) +cmProp cmLocalGenerator::GetFeature(const std::string& feature, + const std::string& config) { std::string featureName = feature; // TODO: Define accumulation policy for features (prepend, append, @@ -3266,7 +3266,7 @@ const char* cmLocalGenerator::GetFeature(const std::string& feature, cmStateSnapshot snp = this->StateSnapshot; while (snp.IsValid()) { if (cmProp value = snp.GetDirectory().GetProperty(featureName)) { - return value->c_str(); + return value; } snp = snp.GetBuildsystemDirectoryParent(); } |