diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-02 15:20:12 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-04-02 15:20:46 (GMT) |
| commit | e95d274f3031180103ee8c88f51432c8d93a5a02 (patch) | |
| tree | bc4e03e2b8d0a2004bf3ef8f9e9feea0fc002e71 /Source/cmSourceFile.cxx | |
| parent | 525bd2d5e6b6fef64f7eeee0df331e19f94d9298 (diff) | |
| parent | aba23c747b4a7fb342ae77d67b8b5cfbe9a67c8c (diff) | |
| download | CMake-e95d274f3031180103ee8c88f51432c8d93a5a02.zip CMake-e95d274f3031180103ee8c88f51432c8d93a5a02.tar.gz CMake-e95d274f3031180103ee8c88f51432c8d93a5a02.tar.bz2 | |
Merge topic 'cmprop-makefile'
aba23c747b cmMakefile::GetProperty: return cmProp
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4559
Diffstat (limited to 'Source/cmSourceFile.cxx')
| -rw-r--r-- | Source/cmSourceFile.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmSourceFile.cxx b/Source/cmSourceFile.cxx index 5dc8b05..ad59cd6 100644 --- a/Source/cmSourceFile.cxx +++ b/Source/cmSourceFile.cxx @@ -367,7 +367,9 @@ const char* cmSourceFile::GetProperty(const std::string& prop) const const bool chain = mf->GetState()->IsPropertyChained(prop, cmProperty::SOURCE_FILE); if (chain) { - return mf->GetProperty(prop, chain); + if (cmProp p = mf->GetProperty(prop, chain)) { + return p->c_str(); + } } return nullptr; } |